Merge commit '9bea91a' into merge_small_prs

[osqa.git] / forum / middleware / extended_user.py

diff --git a/forum/middleware/extended_user.py b/forum/middleware/extended_user.py
index dfe71636fe3388c108fd7f0ff3894eecb2c3fc8b..ca1d15112f577ff51be62630d8ce24412fded98d 100644 (file)
--- a/forum/middleware/extended_user.py
+++ b/forum/middleware/extended_user.py
@@ -1,27 +1,27 @@
-from django.contrib.auth.middleware import AuthenticationMiddleware\r
-from django.contrib.auth import logout\r
-from forum.models.user import AnonymousUser\r
-from forum.views.auth import forward_suspended_user\r
-import logging\r
-\r
-class ExtendedUser(AuthenticationMiddleware):\r
-    def process_request(self, request):\r
-        super(ExtendedUser, self).process_request(request)\r
-        if request.user.is_authenticated():\r
-            try:\r
-                request.user = request.user.user\r
-\r
-                if request.user.is_suspended():\r
-                    user = request.user\r
-                    logout(request)\r
-                    return forward_suspended_user(request, user)\r
-\r
-                return None\r
-            except Exception, e:\r
-                import traceback\r
-                logging.error("Unable to convert auth_user %s to forum_user: \n%s" % (\r
-                    request.user.id, traceback.format_exc()\r
-                ))\r
-\r
-        request.user = AnonymousUser()\r
+from django.contrib.auth.middleware import AuthenticationMiddleware
+from django.contrib.auth import logout
+from forum.models.user import AnonymousUser
+from forum.views.auth import forward_suspended_user
+import logging
+
+class ExtendedUser(AuthenticationMiddleware):
+    def process_request(self, request):
+        super(ExtendedUser, self).process_request(request)
+        if request.user.is_authenticated():
+            try:
+                request.user = request.user.user
+
+                if request.user.is_suspended():
+                    user = request.user
+                    logout(request)
+                    return forward_suspended_user(request, user)
+
+                return None
+            except Exception, e:
+                import traceback
+                logging.error("Unable to convert auth_user %s to forum_user: \n%s" % (
+                    request.user.id, traceback.format_exc()
+                ))
+
+        request.user = AnonymousUser()
         return None
\ No newline at end of file