Author: mtredinnick
Date: 2007-07-15 23:54:49 -0500 (Sun, 15 Jul 2007)
New Revision: 5715
Modified:
django/trunk/AUTHORS
django/trunk/django/contrib/comments/templatetags/comments.py
Log:
Fixed #4887 -- Fixed another place where template tag arguments are used
directly as function keyword args. Thanks, Brian Rosner.
Modified: django/trunk/AUTHORS
===================================================================
--- django/trunk/AUTHORS 2007-07-16 04:47:52 UTC (rev 5714)
+++ django/trunk/AUTHORS 2007-07-16 04:54:49 UTC (rev 5715)
@@ -222,6 +222,7 @@
[EMAIL PROTECTED]
Henrique Romano <[EMAIL PROTECTED]>
Armin Ronacher
+ Brian Rosner <[EMAIL PROTECTED]>
Oliver Rutherfurd <http://rutherfurd.net/>
Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
Vinay Sajip <[EMAIL PROTECTED]>
Modified: django/trunk/django/contrib/comments/templatetags/comments.py
===================================================================
--- django/trunk/django/contrib/comments/templatetags/comments.py
2007-07-16 04:47:52 UTC (rev 5714)
+++ django/trunk/django/contrib/comments/templatetags/comments.py
2007-07-16 04:54:49 UTC (rev 5715)
@@ -5,6 +5,7 @@
from django.template import loader
from django.core.exceptions import ObjectDoesNotExist
from django.contrib.contenttypes.models import ContentType
+from django.utils.encoding import smart_str
import re
register = template.Library()
@@ -174,6 +175,7 @@
if tokens[4] != 'with':
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 ##############################################
option_list = args.split(',')
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
