Merge pull request #1 from vikingco/CP-121/django1.9-upgrade-incompat…

…iblechanges

CP-121: Django 1.9 Upgrade: Final release (stage two)

django_statsd/patches/cache.py

@@ -16,6 +16,10 @@ def __init__(self, cache):
     def __getattribute__(self, attr):
         if attr == 'cache':
             return BaseCache.__getattribute__(self, attr)
+        # Don't wrap default_timeout in a functools.partial object (see wrap)
+        # This ensures compatibility with django-parler 1.6 under Django 1.9
+        if attr == 'default_timeout':
+            return self.cache.default_timeout
         return wrap(getattr(self.cache, attr), key(self.cache, attr))
 
 

django_statsd/tests.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import sys
+import unittest
 
 from django.conf import settings
 from nose.exc import SkipTest
@@ -18,7 +19,6 @@
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils import dictconfig
-from django.utils import unittest
 
 import mock
 from nose.tools import eq_