Correctly fixed #886

1 files changed, 10 insertions, 1 deletions

diff --git a/raven/contrib/django/middleware/__init__.py b/raven/contrib/django/middleware/__init__.py
index 1ecec8d..43b061f 100644
--- a/raven/contrib/django/middleware/__init__.py
+++ b/raven/contrib/django/middleware/__init__.py
@@ -78,7 +78,16 @@ class SentryResponseErrorIdMiddleware(MiddlewareMixin):
         return response
 
 
-class SentryMiddleware(threading.local):
+# We need to make a base class for our sentry middleware that is thread
+# local but at the same time has the new fnagled middleware mixin applied
+# if such a thing exists.
+if MiddlewareMixin is object:
+    _SentryMiddlewareBase = threading.local
+else:
+    _SentryMiddlewareBase = type('_SentryMiddlewareBase', (MiddlewareMixin, threading.local), {})
+
+
+class SentryMiddleware(_SentryMiddlewareBase):
     resolver = RouteResolver()
 
     # backwards compat