summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-05-18 17:06:25 +0200
committerClaude Paroz <claude@2xlibre.net>2012-05-18 17:06:25 +0200
commit02eca6c0e238c43f888e9e17c373dbb479c868bb (patch)
tree4fb4daa1168902a8ea5e91d37d0f245b341d2683
parentd04f72fb31bab43386e12963c1c6dec23ae16143 (diff)
Added more relative imports in contrib.gis.
-rw-r--r--django/contrib/gis/gdal/tests/__init__.py4
-rw-r--r--django/contrib/gis/geoip/__init__.py4
-rw-r--r--django/contrib/gis/geos/tests/__init__.py4
3 files changed, 9 insertions, 3 deletions
diff --git a/django/contrib/gis/gdal/tests/__init__.py b/django/contrib/gis/gdal/tests/__init__.py
index ee9fad2a67..eb72a38775 100644
--- a/django/contrib/gis/gdal/tests/__init__.py
+++ b/django/contrib/gis/gdal/tests/__init__.py
@@ -2,10 +2,12 @@
Module for executing all of the GDAL tests. None
of these tests require the use of the database.
"""
+from __future__ import absolute_import
+
from django.utils.unittest import TestSuite, TextTestRunner
# Importing the GDAL test modules.
-import test_driver, test_ds, test_envelope, test_geom, test_srs
+from . import test_driver, test_ds, test_envelope, test_geom, test_srs
test_suites = [test_driver.suite(),
test_ds.suite(),
diff --git a/django/contrib/gis/geoip/__init__.py b/django/contrib/gis/geoip/__init__.py
index 2e38e636f7..8b519a242d 100644
--- a/django/contrib/gis/geoip/__init__.py
+++ b/django/contrib/gis/geoip/__init__.py
@@ -11,8 +11,10 @@
Grab GeoIP.dat.gz and GeoLiteCity.dat.gz, and unzip them in the directory
corresponding to settings.GEOIP_PATH.
"""
+from __future__ import absolute_import
+
try:
- from django.contrib.gis.geoip.base import GeoIP, GeoIPException
+ from .base import GeoIP, GeoIPException
HAS_GEOIP = True
except:
HAS_GEOIP = False
diff --git a/django/contrib/gis/geos/tests/__init__.py b/django/contrib/gis/geos/tests/__init__.py
index 6c6c18e496..ccf960c68f 100644
--- a/django/contrib/gis/geos/tests/__init__.py
+++ b/django/contrib/gis/geos/tests/__init__.py
@@ -1,8 +1,10 @@
"""
GEOS Testing module.
"""
+from __future__ import absolute_import
+
from django.utils.unittest import TestSuite, TextTestRunner
-import test_geos, test_io, test_geos_mutation, test_mutable_list
+from . import test_geos, test_io, test_geos_mutation, test_mutable_list
test_suites = [
test_geos.suite(),