Migrate to Django 1.6

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

diff --git a/forum/templatetags/general_sidebar_tags.py b/forum/templatetags/general_sidebar_tags.py
index 2f70fa2c62fa2b31dde5137646dde20bfcd7f232..ea8309982915e06e698ce697f58e1815e2b43cb0 100644 (file)
--- a/forum/templatetags/general_sidebar_tags.py
+++ b/forum/templatetags/general_sidebar_tags.py
@@ -1,39 +1,39 @@
-from django import template\r
-from forum.models import Tag, Award\r
-from forum import settings\r
-\r
-from extra_filters import static_content\r
-\r
-register = template.Library()\r
-\r
-@register.inclusion_tag('sidebar/markdown_help.html')\r
-def markdown_help():\r
-    return {}\r
-\r
-@register.inclusion_tag('sidebar/recent_awards.html')\r
-def recent_awards():\r
-    return {'awards': Award.objects.order_by('-awarded_at')[:settings.RECENT_AWARD_SIZE]}\r
-\r
-@register.inclusion_tag('sidebar/user_blocks.html')\r
-def sidebar_upper():\r
-    return {\r
-        'show': settings.SIDEBAR_UPPER_SHOW,\r
-        'content': static_content(settings.SIDEBAR_UPPER_TEXT, settings.SIDEBAR_UPPER_RENDER_MODE),\r
-        'wrap': not settings.SIDEBAR_UPPER_DONT_WRAP,\r
-        'blockid': 'sidebar-upper'\r
-    }\r
-\r
-@register.inclusion_tag('sidebar/user_blocks.html')\r
-def sidebar_lower():\r
-    return {\r
-        'show': settings.SIDEBAR_LOWER_SHOW,\r
-        'content': static_content(settings.SIDEBAR_LOWER_TEXT, settings.SIDEBAR_LOWER_RENDER_MODE),\r
-        'wrap': not settings.SIDEBAR_LOWER_DONT_WRAP,\r
-        'blockid': 'sidebar-lower'\r
-    }\r
-\r
-@register.inclusion_tag('sidebar/recent_tags.html')\r
-def recent_tags():\r
-    return {'tags': Tag.active.order_by('-id')[:settings.RECENT_TAGS_SIZE]}\r
-\r
+from django import template
+from forum.models import Tag, Award
+from forum import settings
+
+from extra_filters import static_content
+
+register = template.Library()
+
+@register.inclusion_tag('sidebar/markdown_help.html')
+def markdown_help():
+    return {}
+
+@register.inclusion_tag('sidebar/recent_awards.html')
+def recent_awards():
+    return {'awards': Award.objects.order_by('-awarded_at')[:settings.RECENT_AWARD_SIZE]}
+
+@register.inclusion_tag('sidebar/user_blocks.html')
+def sidebar_upper():
+    return {
+        'show': settings.SIDEBAR_UPPER_SHOW,
+        'content': static_content(settings.SIDEBAR_UPPER_TEXT, settings.SIDEBAR_UPPER_RENDER_MODE),
+        'wrap': not settings.SIDEBAR_UPPER_DONT_WRAP,
+        'blockid': 'sidebar-upper'
+    }
+
+@register.inclusion_tag('sidebar/user_blocks.html')
+def sidebar_lower():
+    return {
+        'show': settings.SIDEBAR_LOWER_SHOW,
+        'content': static_content(settings.SIDEBAR_LOWER_TEXT, settings.SIDEBAR_LOWER_RENDER_MODE),
+        'wrap': not settings.SIDEBAR_LOWER_DONT_WRAP,
+        'blockid': 'sidebar-lower'
+    }
+
+@register.inclusion_tag('sidebar/recent_tags.html')
+def recent_tags():
+    return {'tags': Tag.active.order_by('-id')[:settings.RECENT_TAGS_SIZE]}
+
     
\ No newline at end of file