summaryrefslogtreecommitdiff
path: root/tests/migrations/test_executor.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-23 16:01:13 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-23 21:37:56 +0100
commite32095616c50bef9b06dc8637a99584ba947bae5 (patch)
treecf37f3c2201a0ad6053e9f4acf8a7e6c3507e410 /tests/migrations/test_executor.py
parentda16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff)
Imported override_settings from its new location.
Diffstat (limited to 'tests/migrations/test_executor.py')
-rw-r--r--tests/migrations/test_executor.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/migrations/test_executor.py b/tests/migrations/test_executor.py
index 5c0131d1d3..e8dcacd80e 100644
--- a/tests/migrations/test_executor.py
+++ b/tests/migrations/test_executor.py
@@ -1,6 +1,7 @@
-from django.test.utils import override_settings
from django.db import connection
from django.db.migrations.executor import MigrationExecutor
+from django.test import override_settings
+
from .test_base import MigrationTestBase