summaryrefslogtreecommitdiff
path: root/tests/contenttypes_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/contenttypes_tests
parent042b7350a080cc964f913faf1cf7f0097f650a58 (diff)
Refs #23919 -- Removed django.test.mock Python 2 compatibility shim.
Diffstat (limited to 'tests/contenttypes_tests')
-rw-r--r--tests/contenttypes_tests/tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/contenttypes_tests/tests.py b/tests/contenttypes_tests/tests.py
index 7fedcb7abd..eecdaa91da 100644
--- a/tests/contenttypes_tests/tests.py
+++ b/tests/contenttypes_tests/tests.py
@@ -1,4 +1,5 @@
import datetime
+from unittest import mock
from django.apps.registry import Apps, apps
from django.conf import settings
@@ -12,7 +13,7 @@ from django.core import checks, management
from django.core.management import call_command
from django.db import connections, migrations, models
from django.test import (
- SimpleTestCase, TestCase, TransactionTestCase, mock, override_settings,
+ SimpleTestCase, TestCase, TransactionTestCase, override_settings,
)
from django.test.utils import captured_stdout, isolate_apps
from django.utils.encoding import force_text