Merge pull request #40 from timgraham/django1.10

jwhitlock · web-flow · commit 0e355e9d1427 · 2016-08-24T12:57:51.000-05:00
Confirm support for Django 1.10
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,9 @@ env:
   - TOXENV=py27-django19
   - TOXENV=py34-django19
   - TOXENV=py35-django19
+  - TOXENV=py27-django110
+  - TOXENV=py34-django110
+  - TOXENV=py35-django110
   - TOXENV=py27-django-master
   - TOXENV=py35-django-master
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,7 +3,7 @@ Changelog
 
 0.6.1 - 2015-12-28
 ------------------
-- Supports Django 1.7 through 1.9
+- Supports Django 1.7 through 1.10
 - Supports Python 2.7, 3.4, and 3.5
 
 0.6.0 - 2015-04-01
diff --git a/README.rst b/README.rst
@@ -34,8 +34,8 @@ Two reasons to use django-pylibmc instead are:
 Requirements
 ------------
 
-django-pylibmc requires pylibmc 1.4.1 or above.  It supports Django 1.7 through
-1.9, and Python versions 2.7, 3.4, and 3.5.
+django-pylibmc requires pylibmc 1.4.1 or above. It supports Django 1.8 through
+1.10, and Python versions 2.7, 3.4, and 3.5.
 
 Installation
 ------------
diff --git a/django_pylibmc/memcached.py b/django_pylibmc/memcached.py
@@ -103,13 +103,7 @@ def get_backend_timeout(self, timeout=DEFAULT_TIMEOUT):
         if timeout == 0:
             return timeout
 
-        try:
-            return super(PyLibMCCache, self).get_backend_timeout(timeout)
-        except AttributeError:
-            # ._get_memcache_timeout() will be deprecated in Django 1.9
-            # It's already raising DeprecationWarning in Django 1.8
-            # See: https://docs.djangoproject.com/en/1.8/internals/deprecation/#deprecation-removed-in-1-9
-            return self._get_memcache_timeout(timeout)
+        return super(PyLibMCCache, self).get_backend_timeout(timeout)
 
     def add(self, key, value, timeout=DEFAULT_TIMEOUT, version=None):
         key = self.make_key(key, version=version)
diff --git a/setup.py b/setup.py
@@ -43,6 +43,9 @@ def run_tests(self):
         # I don't know what exactly this means, but why not?
         'Environment :: Web Environment :: Mozilla',
         'Framework :: Django',
+        'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
diff --git a/tests/tests.py b/tests/tests.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import time
+from django.core.cache import caches
 from django.test import TestCase
 
 from .models import Poll, expensive_calculation
@@ -15,24 +16,12 @@ def m(n):
         return 24
 
 
-def load_cache(name):
-    try:
-        from django.core.cache import caches
-    except ImportError:
-        # Use Django 1.6 and earlier method
-        from django.core.cache import get_cache
-        return get_cache(name)
-    else:
-        return caches[name]
-
-
-# Lifted originally from django/regressiontests/cache/tests.py.
-# In Django 1.8 (and earlier), tests are in tests/cache/tests.py.
+# Lifted from tests/cache/tests.py in Django.
 class PylibmcCacheTests(TestCase):
     cache_name = 'default'
 
     def setUp(self):
-        self.cache = load_cache(self.cache_name)
+        self.cache = caches[self.cache_name]
 
     def tearDown(self):
         self.cache.clear()
diff --git a/tox.ini b/tox.ini
@@ -5,13 +5,13 @@
 
 [tox]
 envlist =
-    py{27,34,35}-django{18,19},
-    py{27,34,35}-django-master,
+    py{27,34,35}-django{18,19,110,-master},
 
 [testenv]
 commands = {envpython} runtests.py
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
+    django110: Django>=1.10a1,<1.11
     django-master: https://github.com/django/django/archive/master.tar.gz
     pylibmc>=1.4.1
