Changeset 4753

Timestamp:

03/20/07 06:07:52 (1 year ago)

Author:

russellm

Message:

Fixed #3714 -- Fixed handling of indented text in wordwrap template filter. Thanks for the fix, Ian Clelland.

Files:

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

django/trunk/django/utils/text.py

@@ -18 +18 @@
-        for word in it:
-            if "\n" in word:
-lines(
+('\n'
-            else:
-                lines = (word,)

django/trunk/tests/regressiontests/defaultfilters/tests.py

@@ -134 +134 @@
-"this is a long\nparagraph of\ntext that\nreally needs\nto be wrapped\nI'm afraid"
-
+>>> wordwrap('this is a short paragraph of text.\n  But this line should be indented',14)
+'this is a\nshort\nparagraph of\ntext.\n  But this\nline should be\nindented'
+
+>>> wordwrap('this is a short paragraph of text.\n  But this line should be indented',15)
+'this is a short\nparagraph of\ntext.\n  But this line\nshould be\nindented'
+
->>> ljust('test', 10)
-'test      '