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

@ -3,6 +3,7 @@ import importlib
import io
import os
import sys
from unittest import mock
from django.apps import apps
from django.core.management import CommandError, call_command
@ -14,7 +15,7 @@ from django.db.migrations.exceptions import (
InconsistentMigrationHistory, MigrationSchemaMissing,
)
from django.db.migrations.recorder import MigrationRecorder
from django.test import mock, override_settings
from django.test import override_settings
from django.utils.encoding import force_text
from .models import UnicodeModel, UnserializableModel