Changeset 8601
- Timestamp:
- 08/26/08 16:32:17 (3 months ago)
- Files:
-
- django/trunk/django/forms/util.py (modified) (2 diffs)
- django/trunk/django/utils/translation/trans_real.py (modified) (1 diff)
- django/trunk/tests/regressiontests/forms/widgets.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/forms/util.py
r8046 r8601 1 from django.utils.html import escape1 from django.utils.html import conditional_escape 2 2 from django.utils.encoding import smart_unicode, StrAndUnicode, force_unicode 3 3 from django.utils.safestring import mark_safe … … 10 10 If the passed dictionary is empty, then return an empty string. 11 11 """ 12 return u''.join([u' %s="%s"' % (k, escape(v)) for k, v in attrs.items()])12 return u''.join([u' %s="%s"' % (k, conditional_escape(v)) for k, v in attrs.items()]) 13 13 14 14 class ErrorDict(dict, StrAndUnicode): django/trunk/django/utils/translation/trans_real.py
r8596 r8601 404 404 datetime_format = ugettext('DATETIME_FORMAT') 405 405 time_format = ugettext('TIME_FORMAT') 406 datetime_full_format = ugettext('DATE_WITH_TIME_FULL') 406 407 if date_format == 'DATE_FORMAT': 407 408 date_format = settings.DATE_FORMAT django/trunk/tests/regressiontests/forms/widgets.py
r8549 r8601 50 50 >>> w.render('email', '', attrs={'class': 'special'}) 51 51 u'<input type="text" class="special" name="email" />' 52 53 'attrs' can be safe-strings if needed 54 >>> w = TextInput(attrs={'onBlur': mark_safe("function('foo')")}) 55 >>> print w.render('email', '') 56 <input onBlur="function('foo')" type="text" name="email" /> 52 57 53 58 # PasswordInput Widget ############################################################
