Skip to content

Commit 0ae708a

Browse files
Make the "mock" dependency optional (only used in Python < 3.3). (#2518)
1 parent ef73192 commit 0ae708a

6 files changed

+18
-6
lines changed

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ crc32c = ["crc32c"]
3737
lz4 = ["lz4"]
3838
snappy = ["python-snappy"]
3939
zstd = ["zstandard"]
40-
testing = ["pytest", "mock", "pytest-mock"]
40+
testing = ["pytest", "mock; python_version < '3.3'", "pytest-mock"]
4141

4242
[tool.setuptools]
4343
include-package-data = false

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ crc32c
33
docker-py
44
flake8
55
lz4
6-
mock
6+
mock; python_version < '3.3'
77
py
88
pylint
99
pytest

test/record/test_default_records.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33
import pytest
4-
from mock import patch
4+
try:
5+
from unittest.mock import patch
6+
except ImportError:
7+
from mock import patch
58
import kafka.codec
69
from kafka.record.default_records import (
710
DefaultRecordBatch, DefaultRecordBatchBuilder

test/record/test_legacy_records.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
from __future__ import unicode_literals
22
import pytest
3-
from mock import patch
3+
try:
4+
from unittest.mock import patch
5+
except ImportError:
6+
from mock import patch
47
from kafka.record.legacy_records import (
58
LegacyRecordBatch, LegacyRecordBatchBuilder
69
)

test/test_conn.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
from errno import EALREADY, EINPROGRESS, EISCONN, ECONNRESET
55
import socket
66

7-
import mock
7+
try:
8+
from unittest import mock
9+
except ImportError:
10+
import mock
811
import pytest
912

1013
from kafka.conn import BrokerConnection, ConnectionStates, collect_hosts

test/test_consumer_integration.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import logging
22
import time
33

4-
from mock import patch, ANY
4+
try:
5+
from unittest.mock import patch, ANY
6+
except ImportError:
7+
from mock import patch, ANY
58
import pytest
69
from kafka.vendor.six.moves import range
710

0 commit comments

Comments
 (0)