summaryrefslogtreecommitdiff
path: root/tests/utils_tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-01-19 12:16:04 -0500
committerTim Graham <timograham@gmail.com>2017-01-20 08:17:20 -0500
commit7aba69145dcb436539a7798086748b73a39121e5 (patch)
tree8f1f4edeec13f02916366e8c961c3028ec0b6560 /tests/utils_tests
parent042b7350a080cc964f913faf1cf7f0097f650a58 (diff)
Refs #23919 -- Removed django.test.mock Python 2 compatibility shim.
Diffstat (limited to 'tests/utils_tests')
-rw-r--r--tests/utils_tests/test_autoreload.py3
-rw-r--r--tests/utils_tests/test_timezone.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/utils_tests/test_autoreload.py b/tests/utils_tests/test_autoreload.py
index 6925da1834..130f5c8c2a 100644
--- a/tests/utils_tests/test_autoreload.py
+++ b/tests/utils_tests/test_autoreload.py
@@ -3,12 +3,13 @@ import os
import shutil
import tempfile
from importlib import import_module
+from unittest import mock
import _thread
from django import conf
from django.contrib import admin
-from django.test import SimpleTestCase, mock, override_settings
+from django.test import SimpleTestCase, override_settings
from django.test.utils import extend_sys_path
from django.utils import autoreload
from django.utils.translation import trans_real
diff --git a/tests/utils_tests/test_timezone.py b/tests/utils_tests/test_timezone.py
index 85b396ab12..3c0b092d8a 100644
--- a/tests/utils_tests/test_timezone.py
+++ b/tests/utils_tests/test_timezone.py
@@ -1,9 +1,10 @@
import datetime
import pickle
+from unittest import mock
import pytz
-from django.test import SimpleTestCase, mock, override_settings
+from django.test import SimpleTestCase, override_settings
from django.utils import timezone
CET = pytz.timezone("Europe/Paris")