Skip to content

Commit 7fbee51

Browse files
committed
tests: Import mock with a compatibility helper
Make sure that mock is imported from the unittest lib on Python 3, because that's its location on Python 3. The mock library is needed for testing on Python 3 too, since otherwise `import mock` raises an ImportError.
1 parent 70599ca commit 7fbee51

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

database_sanitizer/tests/_compat.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
try:
2+
from unittest import mock
3+
except ImportError:
4+
import mock
5+
6+
__all__ = ['mock']

database_sanitizer/tests/test_config.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88

99
from ..config import Configuration, ConfigurationError
1010

11-
try:
12-
from unittest import mock
13-
except ImportError:
14-
import mock
11+
from ._compat import mock
1512

1613

1714
def test_load_config_data_must_be_dict():

database_sanitizer/tests/test_dump_postgres.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
from ..dump import postgres as dump_postgres
1414
from ..utils.postgres import decode_copy_value
1515

16-
try:
17-
from unittest import mock
18-
except ImportError:
19-
import mock
16+
from ._compat import mock
2017

2118

2219
MOCK_PG_DUMP_OUTPUT = b"""

database_sanitizer/tests/test_sanitizers_string.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from __future__ import unicode_literals
44

5-
import mock
65
import pytest
76

87
from ..sanitizers.string import sanitize_empty, sanitize_random, sanitize_zfill
8+
from ._compat import mock
99

1010

1111
@pytest.mark.parametrize(

database_sanitizer/tests/test_sanitizers_times.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import datetime
22

3-
import mock
4-
53
from database_sanitizer.sanitizers import times
64

5+
from ._compat import mock
6+
77

88
class _FakeDateTime(datetime.datetime):
99
@staticmethod

0 commit comments

Comments
 (0)