summaryrefslogtreecommitdiff
path: root/tests/test_runner/tests.py
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/test_runner/tests.py
parent042b7350a080cc964f913faf1cf7f0097f650a58 (diff)
downloaddjango-7aba69145dcb436539a7798086748b73a39121e5.tar.gz
Refs #23919 -- Removed django.test.mock Python 2 compatibility shim.
Diffstat (limited to 'tests/test_runner/tests.py')
-rw-r--r--tests/test_runner/tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py
index 51810fe7bc..2de8122135 100644
--- a/tests/test_runner/tests.py
+++ b/tests/test_runner/tests.py
@@ -2,6 +2,7 @@
Tests for django test runner
"""
import unittest
+from unittest import mock
from admin_scripts.tests import AdminScriptTestCase
@@ -10,7 +11,7 @@ from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.core.management import call_command
from django.test import (
- TestCase, TransactionTestCase, mock, skipUnlessDBFeature, testcases,
+ TestCase, TransactionTestCase, skipUnlessDBFeature, testcases,
)
from django.test.runner import DiscoverRunner
from django.test.testcases import connections_support_transactions