summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2009-05-02 16:17:36 +0000
committerJustin Bronn <jbronn@gmail.com>2009-05-02 16:17:36 +0000
commitcb5e8e29f062ac92397a3ce8c5454693bf9845ab (patch)
tree5c7edd3523432ffff59ebf32dd5c03a3b91c50d4
parent71055085a38180544d9cc6392778146bc38ed438 (diff)
Removed module-level imports from `django.test` -- this prevented running the GEOS, GDAL tests from outside a Django environment (e.g., when there's no `settings.py`).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/gis/tests/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/gis/tests/__init__.py b/django/contrib/gis/tests/__init__.py
index e5b56cdac8..75b8fc9d0d 100644
--- a/django/contrib/gis/tests/__init__.py
+++ b/django/contrib/gis/tests/__init__.py
@@ -1,5 +1,4 @@
import sys, unittest
-from django.test.simple import reorder_suite, TestCase
from django.utils.importlib import import_module
def geo_suite():
@@ -120,7 +119,7 @@ def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[], suite=
from django.conf import settings
from django.db import connection
from django.db.models import get_app, get_apps
- from django.test.simple import build_suite, build_test
+ from django.test.simple import build_suite, build_test, reorder_suite, TestCase
from django.test.utils import setup_test_environment, teardown_test_environment
# The `create_test_spatial_db` routine abstracts away all the steps needed