Migrate to Django 1.6

[osqa.git] / forum / templatetags / user_tags.py

diff --git a/forum/templatetags/user_tags.py b/forum/templatetags/user_tags.py
index 2bc4385f8f0cf35379e8304d156361d8811ec97d..d16153dd322b4b9e1fab8ccdfda1a3faf2e3a9cb 100644 (file)
--- a/forum/templatetags/user_tags.py
+++ b/forum/templatetags/user_tags.py
@@ -1,74 +1,74 @@
-from django import template\r
-from django.utils.translation import ugettext as _\r
-from django.utils.safestring import mark_safe\r
-import logging\r
-\r
-register = template.Library()\r
-\r
-class UserSignatureNode(template.Node):\r
-    template = template.loader.get_template('users/signature.html')\r
-\r
-    def __init__(self, user, format):\r
-        self.user = template.Variable(user)\r
-        self.format = template.Variable(format)\r
-\r
-    def render(self, context):\r
-        return self.template.render(template.Context({\r
-        'user': self.user.resolve(context),\r
-        'format': self.format.resolve(context)\r
-        }))\r
-\r
-@register.tag\r
-def user_signature(parser, token):\r
-    try:\r
-        tag_name, user, format = token.split_contents()\r
-    except ValueError:\r
-        raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]\r
-\r
-    return UserSignatureNode(user, format)\r
-\r
-\r
-class ActivityNode(template.Node):\r
-    template = template.loader.get_template('users/activity.html')\r
-\r
-    def __init__(self, activity, viewer):\r
-        self.activity = template.Variable(activity)\r
-        self.viewer = template.Variable(viewer)\r
-\r
-    def render(self, context):\r
-        try:\r
-            action = self.activity.resolve(context).leaf\r
-            viewer = self.viewer.resolve(context)\r
-            describe = mark_safe(action.describe(viewer))\r
-            return self.template.render(template.Context(dict(action=action, describe=describe)))\r
-        except Exception, e:\r
-            import traceback\r
-            msg = "Error in action describe: \n %s" % (\r
-                traceback.format_exc()\r
-            )\r
-            logging.error(msg)\r
-\r
-@register.tag\r
-def activity_item(parser, token):\r
-    try:\r
-        tag_name, activity, viewer = token.split_contents()\r
-    except ValueError:\r
-        raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]\r
-\r
-    return ActivityNode(activity, viewer)\r
-\r
-\r
-@register.tag\r
-def flagged_item(parser, token):\r
-    try:\r
-        tag_name, post, viewer = token.split_contents()\r
-    except ValueError:\r
-        raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]\r
-\r
-    return ActivityNode(post, viewer)\r
-\r
-\r
-@register.inclusion_tag('users/menu.html')\r
-def user_menu(viewer, user):\r
-    return dict(viewer=viewer, user=user)\r
-\r
+from django import template
+from django.utils.translation import ugettext as _
+from django.utils.safestring import mark_safe
+import logging
+
+register = template.Library()
+
+class UserSignatureNode(template.Node):
+    template = template.loader.get_template('users/signature.html')
+
+    def __init__(self, user, format):
+        self.user = template.Variable(user)
+        self.format = template.Variable(format)
+
+    def render(self, context):
+        return self.template.render(template.Context({
+        'user': self.user.resolve(context),
+        'format': self.format.resolve(context)
+        }))
+
+@register.tag
+def user_signature(parser, token):
+    try:
+        tag_name, user, format = token.split_contents()
+    except ValueError:
+        raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]
+
+    return UserSignatureNode(user, format)
+
+
+class ActivityNode(template.Node):
+    template = template.loader.get_template('users/activity.html')
+
+    def __init__(self, activity, viewer):
+        self.activity = template.Variable(activity)
+        self.viewer = template.Variable(viewer)
+
+    def render(self, context):
+        try:
+            action = self.activity.resolve(context).leaf
+            viewer = self.viewer.resolve(context)
+            describe = mark_safe(action.describe(viewer))
+            return self.template.render(template.Context(dict(action=action, describe=describe)))
+        except Exception, e:
+            import traceback
+            msg = "Error in action describe: \n %s" % (
+                traceback.format_exc()
+            )
+            logging.error(msg)
+
+@register.tag
+def activity_item(parser, token):
+    try:
+        tag_name, activity, viewer = token.split_contents()
+    except ValueError:
+        raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]
+
+    return ActivityNode(activity, viewer)
+
+
+@register.tag
+def flagged_item(parser, token):
+    try:
+        tag_name, post, viewer = token.split_contents()
+    except ValueError:
+        raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]
+
+    return ActivityNode(post, viewer)
+
+
+@register.inclusion_tag('users/menu.html')
+def user_menu(viewer, user):
+    return dict(viewer=viewer, user=user)
+