Changeset 5715

Timestamp:

07/15/07 23:54:49 (1 year ago)

Author:

mtredinnick

Message:

Fixed #4887 -- Fixed another place where template tag arguments are used
directly as function keyword args. Thanks, Brian Rosner.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/contrib/comments/templatetags/comments.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -223 +223 @@
-    Henrique Romano <onaiort@gmail.com>
-    Armin Ronacher
+    Brian Rosner <brosner@gmail.com>
-    Oliver Rutherfurd <http://rutherfurd.net/>
-    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>

django/trunk/django/contrib/comments/templatetags/comments.py

@@ -6 +6 @@
-from django.core.exceptions import ObjectDoesNotExist
-from django.contrib.contenttypes.models import ContentType
+from django.utils.encoding import smart_str
-import re
-
@@ -175 +176 @@
-                raise template.TemplateSyntaxError, "Fourth argument in %r tag must be 'with'" % tokens[0]
-            for option, args in zip(tokens[5::2], tokens[6::2]):
+                option = smart_str(option)
-                if option in ('photos_optional', 'photos_required') and not self.free:
-                    # VALIDATION ##############################################