summaryrefslogtreecommitdiff
path: root/tests/staticfiles_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/staticfiles_tests
parent042b7350a080cc964f913faf1cf7f0097f650a58 (diff)
Refs #23919 -- Removed django.test.mock Python 2 compatibility shim.
Diffstat (limited to 'tests/staticfiles_tests')
-rw-r--r--tests/staticfiles_tests/test_management.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/staticfiles_tests/test_management.py b/tests/staticfiles_tests/test_management.py
index f0160c60d8..a9aeb68c3a 100644
--- a/tests/staticfiles_tests/test_management.py
+++ b/tests/staticfiles_tests/test_management.py
@@ -5,6 +5,7 @@ import shutil
import tempfile
import unittest
from io import StringIO
+from unittest import mock
from admin_scripts.tests import AdminScriptTestCase
@@ -13,7 +14,7 @@ from django.contrib.staticfiles import storage
from django.contrib.staticfiles.management.commands import collectstatic
from django.core.exceptions import ImproperlyConfigured
from django.core.management import call_command
-from django.test import mock, override_settings
+from django.test import override_settings
from django.test.utils import extend_sys_path
from django.utils import timezone
from django.utils._os import symlinks_supported