Add compatibility fixes for django 1.8

django_options/compat.py

@@ -0,0 +1,4 @@
+try:
+    from django.contrib.admin.helpers import normalize_fieldsets
+except ImportError:
+    normalize_fieldsets = lambda x: x

django_options/formset.py

@@ -1,10 +1,14 @@
 from django import forms
 from django.conf import settings
-from django.contrib.admin.helpers import normalize_fieldsets, AdminReadonlyField, AdminField
+from django.contrib.admin.helpers import AdminReadonlyField, AdminField
 from django.contrib.admin.templatetags.admin_static import static
 from django.utils.safestring import mark_safe
 
+from .compat import normalize_fieldsets
+
+
 class AdminForm(object):
+
     def __init__(self, form, fieldsets, readonly_fields=None):
         self.form, self.fieldsets = form, normalize_fieldsets(fieldsets)
         if readonly_fields is None:

django_options/managers.py

@@ -18,14 +18,19 @@ def __init__(self, **kwargs):
         self.__is_validated = False
         super(OptionManager, self).__init__(**kwargs)
 
-    def get_queryset(self):
+    def _get_queryset(self):
         # monkey patch for CurrentSiteManage
         # that allows to change site_id
+        try:
+            qs = super(OptionManager, self).get_queryset()
+        except AttributeError:
+            qs = super(OptionManager, self).get_query_set()
+
         if not self.site_id:
-            return super(OptionManager, self).get_query_set()
-        return super(CurrentSiteManager, self).get_query_set().filter(**{self.__field_name + '__id__exact': self.site_id})
+            return qs
+        return qs.filter(**{self.__field_name + '__id__exact': self.site_id})
 
-    get_query_set = get_queryset
+    get_queryset = _get_queryset
 
     def clear(self):
         self.all_options = None
@@ -41,11 +46,11 @@ def fetch_all_options(self):
         """
         if self.all_options is None:
 
-            all_options_db = self.get_query_set().filter(autoload=True).values()
+            all_options_db = self.get_queryset().filter(autoload=True).values()
 
             if not any(all_options_db):
                 # try to load all
-                all_options_db = self.get_query_set().all().values()
+                all_options_db = self.get_queryset().all().values()
 
             self.all_options = {}
 
@@ -82,26 +87,25 @@ def get_option(self, key, default= None):
             value = self.single_options[key]
 
         elif key in self.all_options:
-            value = self.get_query_set().model( value=self.all_options[key] ).value
+            value = self.get_queryset().model(value=self.all_options[key]).value
             # to prevent double decoding
             self.single_options[key] = value
 
         else:
             try:
-                opt = self.get_query_set().get( key=key )
+                opt = self.get_queryset().get(key=key)
                 # already deserialized
                 value = opt.value
                 # remember that
-                self.single_options[ key ] = value
+                self.single_options[key] = value
 
-            except self.get_query_set().model.DoesNotExist:
+            except self.get_queryset().model.DoesNotExist:
                 self.not_options[key] = True
                 return default
 
         # maybe deserialize json
         return value
 
-
     def update_option(self, key, new_value, **kwargs):
         """
         Update the value of an option that was already added.
@@ -148,8 +152,7 @@ def update_option(self, key, new_value, **kwargs):
 
         option_value_changed.send(self, old_value=old_value, new_value=new_value, option=key)
 
-        return self.get_query_set().filter(key=key).update(value=new_value) == 1
-
+        return self.get_queryset().filter(key=key).update(value=new_value) == 1
 
     def add_option(self, key, value, autoload=True):
         """
@@ -187,7 +190,7 @@ def add_option(self, key, value, autoload=True):
                 return False
 
         try:
-            option = self.get_query_set().create(key=key, site_id=self.get_site_id(), value=value, autoload=autoload)
+            option = self.get_queryset().create(key=key, site_id=self.get_site_id(), value=value, autoload=autoload)
         except IntegrityError:
             return False
 
@@ -220,7 +223,7 @@ def delete_option(self, key):
         key = key.strip()
         if not key: return None
 
-        OptionQuery = self.get_query_set()
+        OptionQuery = self.get_queryset()
 
         try:
             opt = OptionQuery.get( key=key )

django_options/models.py

@@ -42,3 +42,4 @@ class Meta:
         unique_together = ('site', 'key',)
         verbose_name = _('Option')
         verbose_name_plural = _('Options')
+        app_label = 'django_options'

requirements.txt

@@ -1,2 +1,3 @@
 django
-django-picklefield
+django-picklefield
+django-faker

runtests.py

@@ -1,28 +1,36 @@
 #!/usr/bin/env python
 import sys
 
+import django
 from django.conf import settings
 
+
 def configure():
 
     settings.configure(
         DATABASES={
             'default': {
                 'ENGINE': 'django.db.backends.sqlite3',
                 'NAME': ':memory:',
-                }
+            }
         },
         INSTALLED_APPS=(
             'django.contrib.sites',
             'django_faker',
             'django_options',
             'picklefield',
-            'django_extensions',
-            ),
+            # 'django_extensions',
+        ),
         SITE_ID=1,
     )
 
-if not settings.configured: configure()
+if not settings.configured:
+    configure()
+
+try:
+    django.setup()
+except Exception:
+    pass
 
 
 def runtests(app_labels=None, verbosity=1):
@@ -34,7 +42,6 @@ def runtests(app_labels=None, verbosity=1):
 
 
 if __name__ == '__main__':
-    import sys
     verbosity = 1
     args = sys.argv[1:]
     idx = args.index('-v') if '-v' in args else -1
@@ -43,5 +50,3 @@ def runtests(app_labels=None, verbosity=1):
         verbosity = int(args.pop(idx)) if len(args) > idx else 2
 
     runtests(args, verbosity=verbosity)
-
-