Author: jbronn
Date: 2009-03-23 23:26:56 -0500 (Mon, 23 Mar 2009)
New Revision: 10137
Modified:
django/trunk/django/contrib/gis/tests/__init__.py
Log:
Fixed error when trying to import the GEOS tests from their new location.
Modified: django/trunk/django/contrib/gis/tests/__init__.py
===================================================================
--- django/trunk/django/contrib/gis/tests/__init__.py 2009-03-24 03:59:38 UTC
(rev 10136)
+++ django/trunk/django/contrib/gis/tests/__init__.py 2009-03-24 04:26:56 UTC
(rev 10137)
@@ -204,21 +204,16 @@
# Class for creating a fake module with a run method. This is for the
# GEOS and GDAL tests that were moved to their respective modules.
class _DeprecatedTestModule(object):
- def __init__(self, tests, mod):
- self.tests = tests
- self.mod = mod
+ def __init__(self, mod_name):
+ self.mod_name = mod_name
def run(self):
from warnings import warn
warn('This test module is deprecated because it has moved to ' \
'`django.contrib.gis.%s.tests` and will disappear in 1.2.' %
- self.mod, DeprecationWarning)
- self.tests.run()
+ self.mod_name, DeprecationWarning)
+ tests = import_module('django.contrib.gis.%s.tests' % self.mod_name)
+ tests.run()
-from django.contrib.gis.geos import tests as _tests
-test_geos = _DeprecatedTestModule(_tests, 'geos')
-
-from django.contrib.gis.gdal import HAS_GDAL
-if HAS_GDAL:
- from django.contrib.gis.gdal import tests as _tests
- test_gdal = _DeprecatedTestModule(_tests, 'gdal')
+test_geos = _DeprecatedTestModule('geos')
+test_gdal = _DeprecatedTestModule('gdal')
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
