diff options
author | Tim Graham <timograham@gmail.com> | 2017-01-19 12:16:04 -0500 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2017-01-20 08:17:20 -0500 |
commit | 7aba69145dcb436539a7798086748b73a39121e5 (patch) | |
tree | 8f1f4edeec13f02916366e8c961c3028ec0b6560 /tests/fixtures | |
parent | 042b7350a080cc964f913faf1cf7f0097f650a58 (diff) | |
download | django-7aba69145dcb436539a7798086748b73a39121e5.tar.gz |
Refs #23919 -- Removed django.test.mock Python 2 compatibility shim.
Diffstat (limited to 'tests/fixtures')
-rw-r--r-- | tests/fixtures/tests.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/fixtures/tests.py b/tests/fixtures/tests.py index ca60dd70e8..89edea424e 100644 --- a/tests/fixtures/tests.py +++ b/tests/fixtures/tests.py @@ -4,6 +4,7 @@ import tempfile import unittest import warnings from io import StringIO +from unittest import mock from django.apps import apps from django.contrib.sites.models import Site @@ -13,9 +14,7 @@ from django.core.management import CommandError from django.core.management.commands.dumpdata import ProxyModelWarning from django.core.serializers.base import ProgressBar from django.db import IntegrityError, connection -from django.test import ( - TestCase, TransactionTestCase, mock, skipUnlessDBFeature, -) +from django.test import TestCase, TransactionTestCase, skipUnlessDBFeature from django.utils.encoding import force_text from .models import ( |