ENH: Adds support for django 1.9

Author: SantiagoTorres

django_pph/management/commands/initialize_pph_context.py

@@ -5,7 +5,7 @@
 
 from django_pph.shamirsecret import ShamirSecret
 from django_pph.settings import SETTINGS
-from django_pph.utils import cache, bin64enc, binary_type
+from django_pph.utils import bin64enc, binary_type
 
 
 class Command(BaseCommand):

django_pph/tests.py

@@ -6,11 +6,10 @@
 
 from copy import deepcopy
 
-from django_pph.utils import get_cache, constant_time_compare
-from django_pph.management.commands.initialize_pph_context import Command as \
-        pph_init
+from django_pph.utils import cache, constant_time_compare
+from django_pph.management.commands.initialize_pph_context import \
+        Command as pph_init
 
-cache = get_cache('pph')
 
 
 def make(password):
@@ -35,8 +34,8 @@ def reset_hasher_state(hasher, backup):
 
 
 class PolyPasswordHasherTestCase(TestCase):
-    hasher = get_hasher('pph')
 
+    hasher = get_hasher('pph')
     # we'll backup everything to avoid some tests from interfering with
     # another
     hasher.load()
@@ -76,6 +75,8 @@ def test_total_shares(self):
     # We create a brand new store, lock it and unlock it. We expect to have
     # the secret back at the end of this function.
     def test_unlock_store(self):
+
+        reset_hasher_state(self.hasher, self.hasherbackup)
 
         password1 = make_share('password1')
         password2 = make_share('password2')

django_pph/utils.py

@@ -1,6 +1,12 @@
 from base64 import b64encode, b64decode
+from distutils.version import StrictVersion
+
+import django
+if StrictVersion(django.get_version()) < StrictVersion('1.9.0'):
+    from django.core.cache import get_cache
+else:
+    from django.core.cache import caches
 
-from django.core.cache import get_cache
 from django.utils import six
 from django.utils import crypto
 
@@ -41,5 +47,10 @@ def constant_time_compare(val1, val2):
 b64enc = lambda s: b64encode(s).decode('ascii').strip()
 bin64enc = lambda s: b64enc(binary_type(s))
 bin64dec = lambda s: binary_type(b64decode(s))
-cache = get_cache(SETTINGS['CACHE_ALIAS'])
-share_cache = get_cache('share_cache')
+
+if StrictVersion(django.get_version()) < StrictVersion('1.9'):
+    cache = get_cache(SETTINGS['CACHE_ALIAS'])
+    share_cache = get_cache('share_cache')
+else:
+    cache = caches[SETTINGS['CACHE_ALIAS']]
+    share_cache = caches['share_cache']

runtests.py

@@ -4,45 +4,47 @@
 import django
 from django.conf import settings
 
+urlpatterns = []
+
 
 DIRNAME = os.path.dirname(__file__)
 
-settings.configure(
-    DEBUG=True,
-    DATABASES={
-        'default': {
-            'ENGINE': 'django.db.backends.sqlite3',
-            'NAME': 'test.db'
-        }
-    },
-    MIDDLEWARE_CLASSES=(),
-    INSTALLED_APPS=(
-        'django.contrib.auth',
-        'django.contrib.contenttypes',
-        'django.contrib.sessions',
-        'django.contrib.admin',
-        'django_pph',
-    ),
-    ROOT_URLCONF='runtests',
-    PASSWORD_HASHERS=(
-        'django_pph.hashers.PolyPasswordHasher',
-    ),
-    CACHES={
-        'default': {
-            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+if not settings.configured:
+    settings.configure(
+        DEBUG=True,
+        DATABASES={
+            'default': {
+                'ENGINE': 'django.db.backends.sqlite3',
+                'NAME': 'test.db'
+            }
         },
-        'pph': {
-            'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-            'LOCATION': 'pph_cache',
-            'TIMEOUT': None,
+        MIDDLEWARE_CLASSES=(),
+        INSTALLED_APPS=(
+            'django.contrib.auth',
+            'django.contrib.contenttypes',
+            'django.contrib.sessions',
+            'django.contrib.admin',
+            'django_pph',
+        ),
+        ROOT_URLCONF='runtests',
+        PASSWORD_HASHERS=(
+            'django_pph.hashers.PolyPasswordHasher',
+        ),
+        CACHES={
+            'default': {
+                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            },
+            'pph': {
+                'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+                'LOCATION': 'pph_cache',
+                'TIMEOUT': None,
+            },
+            'share_cache': {
+                'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+                'LOCATION': 'share_table',
+            }
         },
-        'share_cache': {
-            'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
-            'LOCATION': 'share_table',
-        }
-    },
-)
-
+    )
 
 if hasattr(django, 'setup'):
     django.setup()

tox.ini

@@ -1,5 +1,10 @@
 [tox]
 envlist =
+    # Django 1.9
+    py3.5-dj1.9,
+    py3.4-dj1.9,
+    py2.7-dj1.9,
+
     # Django 1.8
     py3.4-dj1.8,
     py3.3-dj1.8,
@@ -37,6 +42,9 @@ commands =
     {envpython} runtests.py initialize_pph_context
     {envpython} runtests.py
 
+deps-1.9=
+    Django>=1.9
+
 deps-1.8=
     Django>=1.8,<1.9
 
@@ -52,7 +60,21 @@ deps-1.5 =
 deps-1.4 =
     Django>=1.4,<1.5
 
-# Django 1.7
+# Django 1.9
+[testenv:py3.5-dj1.9]
+basepython = python3.5
+deps = {[testenv]deps-1.9}
+
+[testenv:py3.4-dj1.9]
+basepython = python3.4
+deps = {[testenv]deps-1.9}
+
+[testenv:py2.7-dj1.9]
+basepython = python2.7
+deps = {[testenv]deps-1.9}
+
+
+# Django 1.8
 [testenv:py3.4-dj1.8]
 basepython = python3.4
 deps = {[testenv]deps-1.8}