Merge a02cc1f into 4858555

jazzband · Jan 23, 2017 · d3f483a · d3f483a
2 parents 4858555 + a02cc1f
commit d3f483a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/runtests.py b/runtests.py
@@ -4,14 +4,13 @@
 test_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, test_dir)
 
-from django.test.utils import get_runner
-from django.conf import settings
 import django
-if django.VERSION >= (1, 7):
-    django.setup()
+from django.conf import settings
+from django.test.utils import get_runner
 
 
 def runtests():
+    django.setup()
     TestRunner = get_runner(settings)
     test_runner = TestRunner(verbosity=1, interactive=True)
     failures = test_runner.run_tests(['tinymce'])