Merge branch 'development'

[django-tables2.git] / django_tables2 / templatetags / django_tables2.py

diff --git a/django_tables/templatetags/django_tables.py b/django_tables2/templatetags/django_tables2.py
similarity index 97%
rename from django_tables/templatetags/django_tables.py
rename to django_tables2/templatetags/django_tables2.py
index 1166a3de3ccf68dc56c745b3071c5ffa73bd7339..3b1a6a5f73c7ac88ed0947747454c4c8fbce83a0 100644 (file)
--- a/django_tables/templatetags/django_tables.py
+++ b/django_tables2/templatetags/django_tables2.py
@@ -1,4 +1,5 @@
-"""
+#! -*- coding: utf-8 -*-
+"""
 Allows setting/changing/removing of chosen url query string parameters, while
 maintaining any existing others.
 
@@ -102,7 +103,7 @@ class RenderTableNode(template.Node):
                                         "table": table})
             try:
                 table.request = context["request"]
-                return get_template("django_tables/table.html").render(context)
+                return get_template("django_tables2/table.html").render(context)
             finally:
                 del table.request
         except: