Move get user preprocessor function

Author: gchandrasa

cached_auth/__init__.py

@@ -18,6 +18,16 @@
 
 CACHE_KEY = 'cached_auth_middleware:%s'
 
+user_preprocessor = None
+if hasattr(settings, 'CACHED_AUTH_PREPROCESSOR'):
+    tmp = settings.CACHED_AUTH_PREPROCESSOR.split(".")
+    module_name, function_name = ".".join(tmp[0:-1]), tmp[-1]
+    func = getattr(__import__(module_name, fromlist=['']), function_name)
+    if callable(func):
+        user_preprocessor = func
+    else:
+        raise Exception("CACHED_AUTH_PREPROCESSOR_FUNCTION should be callable function with arguments user, request")
+
 try:
     app_label, model_name = settings.AUTH_PROFILE_MODULE.split('.')
     profile_model = models.get_model(app_label, model_name)
@@ -42,14 +52,8 @@ def get_cached_user(request):
             user = AnonymousUser()
         if user is None:
             user = get_user(request)
-            if hasattr(settings, 'CACHED_AUTH_PREPROCESSOR_FUNCTION'):
-                tmp = settings.CACHED_AUTH_PREPROCESSOR_FUNCTION.split(".")
-                module_name, function_name = ".".join(tmp[0:-1]), tmp[-1]
-                func = getattr(__import__(module_name, fromlist=['']), function_name)
-                if callable(func):
-                    user = func(user, request)
-                else:
-                    raise Exception("CACHED_AUTH_PREPROCESSOR_FUNCTION should be callable function with arguments user, request")
+            if user_preprocessor:
+                user_preprocessor(user, request)
             # Try to populate profile cache if profile is installed
             if profile_model:
                 try:

cached_auth/tests.py

@@ -4,6 +4,9 @@
 from django.test.client import Client
 from django.test.utils import override_settings
 from cached_auth import CACHE_KEY
+from django.conf import settings
+
+import cached_auth
 
 try:
     from django.contrib.auth import get_user_model
@@ -53,8 +56,9 @@ def test_cached_middleware(self):
         self.user.delete()
         self.assertEqual(cache.get(key), None)
 
-    @override_settings(CACHED_AUTH_PREPROCESSOR_FUNCTION='cached_auth.tests.auth_preprocessor')
+    @override_settings(CACHED_AUTH_PREPROCESSOR='cached_auth.tests.auth_preprocessor')
     def test_cached_auth_preprocessor_function(self):
+        reload(cached_auth)
         client = Client()
         key = CACHE_KEY % self.user.id
         self.assertEqual(cache.get(key), None)