Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #30 from sevas/wordwrap-newline

wordwrap filter should use the newline_sequence defined in current Environment
  • Loading branch information...
commit 7c97352a4ac5e4eb8ff6a855f921e578925356f7 2 parents fbfc9d2 + 218cb64
@mitsuhiko mitsuhiko authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 jinja2/filters.py
View
6 jinja2/filters.py
@@ -443,8 +443,8 @@ def do_truncate(s, length=255, killwords=False, end='...'):
result.append(end)
return u' '.join(result)
-
-def do_wordwrap(s, width=79, break_long_words=True):
+@environmentfilter
+def do_wordwrap(environment, s, width=79, break_long_words=True):
"""
Return a copy of the string passed to the filter wrapped after
``79`` characters. You can override this default using the first
@@ -452,7 +452,7 @@ def do_wordwrap(s, width=79, break_long_words=True):
split words apart if they are longer than `width`.
"""
import textwrap
- return u'\n'.join(textwrap.wrap(s, width=width, expand_tabs=False,
+ return environment.newline_sequence.join(textwrap.wrap(s, width=width, expand_tabs=False,
replace_whitespace=False,
break_long_words=break_long_words))

0 comments on commit 7c97352

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