summaryrefslogtreecommitdiff
path: root/tests/files
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/files
parent042b7350a080cc964f913faf1cf7f0097f650a58 (diff)
downloaddjango-7aba69145dcb436539a7798086748b73a39121e5.tar.gz
Refs #23919 -- Removed django.test.mock Python 2 compatibility shim.
Diffstat (limited to 'tests/files')
-rw-r--r--tests/files/tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/files/tests.py b/tests/files/tests.py
index 7323b6987e..f7d05574d2 100644
--- a/tests/files/tests.py
+++ b/tests/files/tests.py
@@ -4,13 +4,13 @@ import struct
import tempfile
import unittest
from io import BytesIO, StringIO, TextIOWrapper
+from unittest import mock
from django.core.files import File
from django.core.files.base import ContentFile
from django.core.files.move import file_move_safe
from django.core.files.temp import NamedTemporaryFile
from django.core.files.uploadedfile import SimpleUploadedFile, UploadedFile
-from django.test import mock
try:
from PIL import Image