diff --git a/pyproject.toml b/pyproject.toml index 48be87ffd..ddd40a08e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ crc32c = ["crc32c"] lz4 = ["lz4"] snappy = ["python-snappy"] zstd = ["zstandard"] -testing = ["pytest", "mock", "pytest-mock"] +testing = ["pytest", "mock; python_version < '3.3'", "pytest-mock"] [tool.setuptools] include-package-data = false diff --git a/requirements-dev.txt b/requirements-dev.txt index e49608a4d..6cfb6d83b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ crc32c docker-py flake8 lz4 -mock +mock; python_version < '3.3' py pylint pytest diff --git a/test/record/test_default_records.py b/test/record/test_default_records.py index c3a7b02c8..e1c840fa6 100644 --- a/test/record/test_default_records.py +++ b/test/record/test_default_records.py @@ -1,7 +1,10 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals import pytest -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch import kafka.codec from kafka.record.default_records import ( DefaultRecordBatch, DefaultRecordBatchBuilder diff --git a/test/record/test_legacy_records.py b/test/record/test_legacy_records.py index 43970f7c9..b15b53704 100644 --- a/test/record/test_legacy_records.py +++ b/test/record/test_legacy_records.py @@ -1,6 +1,9 @@ from __future__ import unicode_literals import pytest -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch from kafka.record.legacy_records import ( LegacyRecordBatch, LegacyRecordBatchBuilder ) diff --git a/test/test_conn.py b/test/test_conn.py index 959cbb4dc..ea88fd04c 100644 --- a/test/test_conn.py +++ b/test/test_conn.py @@ -4,7 +4,10 @@ from errno import EALREADY, EINPROGRESS, EISCONN, ECONNRESET import socket -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest from kafka.conn import BrokerConnection, ConnectionStates, collect_hosts diff --git a/test/test_consumer_integration.py b/test/test_consumer_integration.py index 5aeb63d1d..af8ec6829 100644 --- a/test/test_consumer_integration.py +++ b/test/test_consumer_integration.py @@ -1,7 +1,10 @@ import logging import time -from mock import patch, ANY +try: + from unittest.mock import patch, ANY +except ImportError: + from mock import patch, ANY import pytest from kafka.vendor.six.moves import range