Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #4887 -- Fixed another place where template tag arguments are used

directly as function keyword args. Thanks, Brian Rosner.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 29891add3d23892f7dd1221d47f15d7455b5926b 1 parent 58096c4
Malcolm Tredinnick authored July 16, 2007
1  AUTHORS
@@ -222,6 +222,7 @@ answer newbie questions, and generally made Django that much better:
222 222
     rhettg@gmail.com
223 223
     Henrique Romano <onaiort@gmail.com>
224 224
     Armin Ronacher
  225
+    Brian Rosner <brosner@gmail.com>
225 226
     Oliver Rutherfurd <http://rutherfurd.net/>
226 227
     Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
227 228
     Vinay Sajip <vinay_sajip@yahoo.co.uk>
2  django/contrib/comments/templatetags/comments.py
@@ -5,6 +5,7 @@
5 5
 from django.template import loader
6 6
 from django.core.exceptions import ObjectDoesNotExist
7 7
 from django.contrib.contenttypes.models import ContentType
  8
+from django.utils.encoding import smart_str
8 9
 import re
9 10
 
10 11
 register = template.Library()
@@ -174,6 +175,7 @@ def __call__(self, parser, token):
174 175
             if tokens[4] != 'with':
175 176
                 raise template.TemplateSyntaxError, "Fourth argument in %r tag must be 'with'" % tokens[0]
176 177
             for option, args in zip(tokens[5::2], tokens[6::2]):
  178
+                option = smart_str(option)
177 179
                 if option in ('photos_optional', 'photos_required') and not self.free:
178 180
                     # VALIDATION ##############################################
179 181
                     option_list = args.split(',')

0 notes on commit 29891ad

Please sign in to comment.
Something went wrong with that request. Please try again.