summaryrefslogtreecommitdiff
path: root/tests/regressiontests/dispatch
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2011-10-13 18:51:33 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2011-10-13 18:51:33 +0000
commitd362c1546f8ad62811e5dee3cf0b43170e6e1c4c (patch)
treec14af91e991cb534a135cc0ca467aa6263007b07 /tests/regressiontests/dispatch
parentd5a45d79fe03cad93ab5761860e9bb6fc1db4c86 (diff)
Convert much of the regression tests to use absolute imports. There's still work to be done though.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/dispatch')
-rw-r--r--tests/regressiontests/dispatch/tests/__init__.py6
-rw-r--r--tests/regressiontests/dispatch/tests/test_dispatcher.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/regressiontests/dispatch/tests/__init__.py b/tests/regressiontests/dispatch/tests/__init__.py
index 150bb01dc0..4e31710814 100644
--- a/tests/regressiontests/dispatch/tests/__init__.py
+++ b/tests/regressiontests/dispatch/tests/__init__.py
@@ -2,5 +2,7 @@
Unit-tests for the dispatch project
"""
-from test_saferef import *
-from test_dispatcher import *
+from __future__ import absolute_import
+
+from .test_saferef import *
+from .test_dispatcher import *
diff --git a/tests/regressiontests/dispatch/tests/test_dispatcher.py b/tests/regressiontests/dispatch/tests/test_dispatcher.py
index a16d8e24f5..ee63e22b99 100644
--- a/tests/regressiontests/dispatch/tests/test_dispatcher.py
+++ b/tests/regressiontests/dispatch/tests/test_dispatcher.py
@@ -1,13 +1,14 @@
import gc
import sys
+import time
from django.dispatch import Signal
from django.utils import unittest
+
if sys.platform.startswith('java'):
def garbage_collect():
"""Run the garbage collector and wait a bit to let it do his work"""
- import time
gc.collect()
time.sleep(0.1)
else: