Django 1.9 compatibility

Fixes disqus#3.

Tested with `python -WError` added to `tox` file, no warnings popped up.

Author: Adam Chainz

CHANGES

@@ -1,3 +1,7 @@
+Pending
+
+- Support for Django 1.9
+
 0.11.0
 
 - Better support for Django 1.6 and Django 1.7
@@ -82,4 +86,4 @@
 - Added ConditionSet.has_active_condition, and support for default NoneType instances
   for global / environment checks.
 - Added HostConditionSet which allows you to specify a switch for a single
-  server hostname
+  server hostname

README.rst

@@ -18,7 +18,7 @@ Requirements
 Tested with all combinations of:
 
 * Python: 2.7
-* Django: 1.7, 1.8
+* Django: 1.7, 1.8, 1.9
 
 Install
 -------

gargoyle/constants.py

@@ -0,0 +1,7 @@
+DISABLED = 1
+SELECTIVE = 2
+GLOBAL = 3
+INHERIT = 4
+
+INCLUDE = 'i'
+EXCLUDE = 'e'

gargoyle/manager.py

@@ -1,11 +1,13 @@
 from django.conf import settings
 from django.core.cache import caches
 from django.http import HttpRequest
+from django.utils.functional import SimpleLazyObject
 from modeldict import ModelDict
 
-from gargoyle.models import DISABLED, EXCLUDE, GLOBAL, INCLUDE, INHERIT, SELECTIVE, Switch
 from gargoyle.proxy import SwitchProxy
 
+from .constants import DISABLED, EXCLUDE, GLOBAL, INCLUDE, INHERIT, SELECTIVE
+
 
 class SwitchManager(ModelDict):
     DISABLED = DISABLED
@@ -144,10 +146,19 @@ def as_request(self, user=None, ip_address=None):
         return MockRequest(user, ip_address)
 
 
-if hasattr(settings, 'GARGOYLE_CACHE_NAME'):
-    gargoyle = SwitchManager(Switch, key='key', value='value', instances=True,
-                             auto_create=getattr(settings, 'GARGOYLE_AUTO_CREATE', True),
-                             cache=caches[settings.GARGOYLE_CACHE_NAME])
-else:
-    gargoyle = SwitchManager(Switch, key='key', value='value', instances=True,
-                             auto_create=getattr(settings, 'GARGOYLE_AUTO_CREATE', True))
+def make_gargoyle():
+    from gargoyle.models import Switch
+
+    kwargs = {
+        'key': 'key',
+        'value': 'value',
+        'instances': True,
+        'auto_create': getattr(settings, 'GARGOYLE_AUTO_CREATE', True),
+    }
+
+    if hasattr(settings, 'GARGOYLE_CACHE_NAME'):
+        kwargs['cache'] = caches[settings.GARGOYLE_CACHE_NAME]
+
+    return SwitchManager(Switch, **kwargs)
+
+gargoyle = SimpleLazyObject(make_gargoyle)

gargoyle/models.py

@@ -11,13 +11,7 @@
 from django.utils.translation import ugettext_lazy as _
 from jsonfield import JSONField
 
-DISABLED = 1
-SELECTIVE = 2
-GLOBAL = 3
-INHERIT = 4
-
-INCLUDE = 'i'
-EXCLUDE = 'e'
+from .constants import DISABLED, EXCLUDE, GLOBAL, INCLUDE, INHERIT, SELECTIVE
 
 
 class Switch(models.Model):

gargoyle/templates/gargoyle/index.html

@@ -1,7 +1,6 @@
 {% extends "nexus/module.html" %}
 
 {% load gargoyle_helpers %}
-{% load url from future %}
 
 {% block head %}
     {{ block.super }}

tox.ini

@@ -1,7 +1,8 @@
 [tox]
 envlist =
     py27-codestyle,
-    py27-nexus{10,master}-django{17,18}
+    py27-nexus10-django{17,18},
+    py27-nexusmaster-django{17,18,19}
 
 [testenv]
 setenv =
@@ -12,6 +13,7 @@ deps =
     nexusmaster: https://github.com/YPlan/nexus/archive/master.tar.gz
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
+    django19: Django>=1.9,<1.10
     -rrequirements.txt
 commands = ./runtests.py --nolint {posargs}