summaryrefslogtreecommitdiff
path: root/tests/admin_scripts
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/admin_scripts
parent042b7350a080cc964f913faf1cf7f0097f650a58 (diff)
downloaddjango-7aba69145dcb436539a7798086748b73a39121e5.tar.gz
Refs #23919 -- Removed django.test.mock Python 2 compatibility shim.
Diffstat (limited to 'tests/admin_scripts')
-rw-r--r--tests/admin_scripts/tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index bccefc2d19..8494d76f4c 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -13,6 +13,7 @@ import sys
import tempfile
import unittest
from io import StringIO
+from unittest import mock
import django
from django import conf, get_version
@@ -24,7 +25,7 @@ from django.db import ConnectionHandler
from django.db.migrations.exceptions import MigrationSchemaMissing
from django.db.migrations.recorder import MigrationRecorder
from django.test import (
- LiveServerTestCase, SimpleTestCase, TestCase, mock, override_settings,
+ LiveServerTestCase, SimpleTestCase, TestCase, override_settings,
)
from django.utils.encoding import force_text