Changeset 5533

Timestamp:

06/25/07 08:11:10 (1 year ago)

Author:

mtredinnick

Message:

unicode: Fixed #4662 -- Fixed a remaining ASCII assumption in
truncatewords_html(). Thanks, Ivan Sagalaev.

Files:

• django/branches/unicode/django/utils/text.py (modified) (1 diff)
• django/branches/unicode/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)

django/branches/unicode/django/utils/text.py

@@ -60 +60 @@
-    html4_singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area', 'hr', 'input')
-    # Set up regular expressions
-[A-Za-z0-9][\w-]*)'
+\w[\w-]*)', re.U
-    re_tag = re.compile(r'<(/)?([^ ]+?)(?: (/)| .*?)?>')
-    # Count non-HTML words and keep note of open tags

django/branches/unicode/tests/regressiontests/defaultfilters/tests.py

@@ -105 +105 @@
-u'<p>one <a href="#">two - three <br>four</a> five</p>'
-
+>>> truncatewords_html(u'\xc5ngstr\xf6m was here', 1)
+u'\xc5ngstr\xf6m ...'
+
->>> upper(u'Mixed case input')
-u'MIXED CASE INPUT'