1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Refs #23919 -- Removed django.test.mock Python 2 compatibility shim.

This commit is contained in:
Tim Graham
2017-01-19 12:16:04 -05:00
parent 042b7350a0
commit 7aba69145d
49 changed files with 97 additions and 81 deletions

View File

@@ -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 (