From 9b1fbf20728276d039f303dcb0973cbb64b26a70 Mon Sep 17 00:00:00 2001
From: Calvin Cheng
Date: Sat, 3 Nov 2012 14:51:44 +0800
Subject: Use python threading module instead of the python3 deprecated thread
 module. Fix this threading related bug - Exception AttributeError:
 AttributeError("_DummyThread object has no attribute _Thread__block",) in
 <module threading from

---
 debug_toolbar/middleware.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 1979e1d..751185f 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -2,7 +2,7 @@
 Debug Toolbar middleware
 """
 import imp
-import thread
+import threading
 
 from django.conf import settings
 from django.http import HttpResponseRedirect
@@ -14,6 +14,7 @@ import debug_toolbar.urls
 from debug_toolbar.toolbar.loader import DebugToolbar
 
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
+threading._DummyThread._Thread__stop = lambda x: 1  # Handles python threading module bug - http://bugs.python.org/issue14308
 
 
 def replace_insensitive(string, target, replacement):
@@ -38,7 +39,7 @@ class DebugToolbarMiddleware(object):
 
     @classmethod
     def get_current(cls):
-        return cls.debug_toolbars.get(thread.get_ident())
+        return cls.debug_toolbars.get(threading.currentThread())
 
     def __init__(self):
         self._urlconfs = {}
@@ -98,11 +99,11 @@ class DebugToolbarMiddleware(object):
             toolbar = DebugToolbar(request)
             for panel in toolbar.panels:
                 panel.process_request(request)
-            self.__class__.debug_toolbars[thread.get_ident()] = toolbar
+            self.__class__.debug_toolbars[threading.currentThread()] = toolbar
 
     def process_view(self, request, view_func, view_args, view_kwargs):
         __traceback_hide__ = True
-        toolbar = self.__class__.debug_toolbars.get(thread.get_ident())
+        toolbar = self.__class__.debug_toolbars.get(threading.currentThread())
         if not toolbar:
             return
         result = None
@@ -114,7 +115,7 @@ class DebugToolbarMiddleware(object):
 
     def process_response(self, request, response):
         __traceback_hide__ = True
-        ident = thread.get_ident()
+        ident = threading.currentThread()
         toolbar = self.__class__.debug_toolbars.get(ident)
         if not toolbar or request.is_ajax():
             return response
-- 
cgit v1.2.3


From f3d5bb79b0a7ceb4f507e8f68a40df408c8176d6 Mon Sep 17 00:00:00 2001
From: Calvin Cheng
Date: Sat, 3 Nov 2012 15:24:52 +0800
Subject: Fix unit test breakage. middleware functions are expecting
 threading.currentThread().ident, which is an integer, and not the
 threading.currentThread() instance itself.

---
 debug_toolbar/middleware.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 751185f..970d421 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -14,7 +14,7 @@ import debug_toolbar.urls
 from debug_toolbar.toolbar.loader import DebugToolbar
 
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
-threading._DummyThread._Thread__stop = lambda x: 1  # Handles python threading module bug - http://bugs.python.org/issue14308
+#threading._DummyThread._Thread__stop = lambda x: 1  # Handles python threading module bug - http://bugs.python.org/issue14308
 
 
 def replace_insensitive(string, target, replacement):
@@ -39,7 +39,7 @@ class DebugToolbarMiddleware(object):
 
     @classmethod
     def get_current(cls):
-        return cls.debug_toolbars.get(threading.currentThread())
+        return cls.debug_toolbars.get(threading.currentThread().ident)
 
     def __init__(self):
         self._urlconfs = {}
@@ -99,11 +99,11 @@ class DebugToolbarMiddleware(object):
             toolbar = DebugToolbar(request)
             for panel in toolbar.panels:
                 panel.process_request(request)
-            self.__class__.debug_toolbars[threading.currentThread()] = toolbar
+            self.__class__.debug_toolbars[threading.currentThread().ident] = toolbar
 
     def process_view(self, request, view_func, view_args, view_kwargs):
         __traceback_hide__ = True
-        toolbar = self.__class__.debug_toolbars.get(threading.currentThread())
+        toolbar = self.__class__.debug_toolbars.get(threading.currentThread().ident)
         if not toolbar:
             return
         result = None
@@ -115,7 +115,7 @@ class DebugToolbarMiddleware(object):
 
     def process_response(self, request, response):
         __traceback_hide__ = True
-        ident = threading.currentThread()
+        ident = threading.currentThread().ident
         toolbar = self.__class__.debug_toolbars.get(ident)
         if not toolbar or request.is_ajax():
             return response
-- 
cgit v1.2.3


From 1a7609c82994df4c78978073cfa6a5b04335b8ed Mon Sep 17 00:00:00 2001
From: Calvin Cheng
Date: Sat, 3 Nov 2012 15:35:23 +0800
Subject: Uncommented out the dummy thread fix by mistake. Adding back in.

---
 debug_toolbar/middleware.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 970d421..b3fc9e3 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -14,7 +14,7 @@ import debug_toolbar.urls
 from debug_toolbar.toolbar.loader import DebugToolbar
 
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
-#threading._DummyThread._Thread__stop = lambda x: 1  # Handles python threading module bug - http://bugs.python.org/issue14308
+threading._DummyThread._Thread__stop = lambda x: 1  # Handles python threading module bug - http://bugs.python.org/issue14308
 
 
 def replace_insensitive(string, target, replacement):
-- 
cgit v1.2.3