[pypy-svn] r54957 - pypy/django/tests

[antocuni at codespeak.net]

Author: antocuni
Date: Mon May 19 19:47:31 2008
New Revision: 54957

Modified:
   pypy/django/tests/conftest.py
Log:
fix import


Modified: pypy/django/tests/conftest.py
==============================================================================
--- pypy/django/tests/conftest.py	(original)
+++ pypy/django/tests/conftest.py	Mon May 19 19:47:31 2008
@@ -49,7 +49,6 @@
 
 class Module(py.test.collect.Module):
     def run(self):
-        from django.conf import settings
         mod = self._get_mod()
         result = self._tests_from_mod(mod)
         modpath = py.path.local(mod.__file__)
@@ -83,6 +82,7 @@
 
     def _get_mod(self):
         from django.db.models.loading import load_app
+        from django.conf import settings
         rel = self.fspath.relto(rootdir)
         app_name = rel.replace(os.path.sep, '.')
         if app_name in loaded_apps: