Ensure not having drf-gis in INSTALLED_APPS works anyway

Addressing issue #68
openwisp · Aug 25, 2015 · db0fc5e · db0fc5e
1 parent 9b44696
commit db0fc5e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/rest_framework_gis/__init__.py b/rest_framework_gis/__init__.py
@@ -16,13 +16,26 @@ def get_version():
 
 default_app_config = 'rest_framework_gis.apps.AppConfig'
 
-# retain support for django 1.5 and 1.6
+# maintain support for django 1.5 and 1.6
+# TODO: remove in version 1.0
 try:
-    import django
     import os
+    import django
 
-    if os.environ.get('DJANGO_SETTINGS_MODULE') and django.get_version() < '1.7':
+    if os.environ.get('DJANGO_SETTINGS_MODULE'):
+        from django.conf import settings
         from .apps import AppConfig
-        AppConfig().ready()
+
+        if 'rest_framework_gis' not in settings.INSTALLED_APPS:
+            import warnings
+            warnings.simplefilter('always', DeprecationWarning)
+            warnings.warn('\nGeoModelSerializer is deprecated, '
+                          'add "rest_framework_gis" to settings.INSTALLED_APPS and use '
+                          '"rest_framework.ModelSerializer" instead',
+                          DeprecationWarning)
+
+        if django.get_version() < '1.7' or 'rest_framework_gis' not in settings.INSTALLED_APPS:
+            import rest_framework_gis
+            AppConfig('rest_framework_gis', rest_framework_gis).ready()
 except ImportError:
     pass
diff --git a/rest_framework_gis/apps.py b/rest_framework_gis/apps.py
@@ -3,7 +3,8 @@
 except ImportError:  # pragma: nocover
     # django <= 1.6
     class BaseConfig(object):
-        pass
+        def __init__(self, *args):
+            pass
 
 
 class AppConfig(BaseConfig):

diff --git a/rest_framework_gis/serializers.py b/rest_framework_gis/serializers.py
@@ -11,18 +11,6 @@ class GeoModelSerializer(ModelSerializer):
     """
     Deprecated, will be removed in django-rest-framework-gis 1.0
     """
-    def __init__(self, *args, **kwargs):  # pragma: no cover
-        # TODO: remove in 1.0
-        from .apps import AppConfig
-        import warnings
-        import rest_framework_gis
-        AppConfig('rest_framework_gis', rest_framework_gis).ready()
-        warnings.simplefilter('always', DeprecationWarning)
-        warnings.warn('\nGeoModelSerializer is deprecated, '
-                      'add "rest_framework_gis" to settings.INSTALLED_APPS and use '
-                      '"rest_framework.ModelSerializer" instead',
-                      DeprecationWarning)
-        super(GeoModelSerializer, self).__init__(*args, **kwargs)
 
 
 class GeoFeatureModelListSerializer(ListSerializer):