--- a/src/ldt/ldt/security/middleware.py	Tue Nov 15 12:47:13 2011 +0100
+++ b/src/ldt/ldt/security/middleware.py	Wed Nov 16 12:34:49 2011 +0100
@@ -1,24 +1,19 @@
 from django.conf import settings
 from django.core.exceptions import MiddlewareNotUsed
-from ldt.security.utils import protect_models, unprotect_models
+from ldt.security.utils import protect_models, unprotect_models, _thread_locals
 
-try:
-    from threading import local
-except ImportError:
-    from django.utils._threading_local import local
-    
-_thread_locals = local()
-    
 class SecurityMiddleware(object):
     
     def __init__(self):
         if not hasattr(settings, 'USE_GROUP_PERMISSIONS') or not settings.USE_GROUP_PERMISSIONS:
             raise MiddlewareNotUsed()
 
-    def process_request(self, request):    
-        protect_models(request.user)      
+    def process_request(self, request):
+        _thread_locals.user = request.user 
+        protect_models()      
     
     def process_response(self, request, response):
         unprotect_models()
-        
+        del _thread_locals.user
+                
         return response
\ No newline at end of file