Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #3714 -- Fixed handling of indented text in wordwrap template f…

…ilter. Thanks for the fix, Ian Clelland.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b8eec54041040eccbd4d6d1077257b65cdb85708 1 parent 83bed03
@freakboy3742 freakboy3742 authored
View
2  django/utils/text.py
@@ -17,7 +17,7 @@ def _generator():
pos = len(word) - word.rfind('\n') - 1
for word in it:
if "\n" in word:
- lines = word.splitlines()
+ lines = word.split('\n')
else:
lines = (word,)
pos += len(lines[0]) + 1
View
6 tests/regressiontests/defaultfilters/tests.py
@@ -133,6 +133,12 @@
>>> wordwrap('this is a long paragraph of text that really needs to be wrapped I\'m afraid', 14)
"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 '
Please sign in to comment.
Something went wrong with that request. Please try again.