From 1572a3d4b2dd4afd004765ba73a2c38b311b65ee Mon Sep 17 00:00:00 2001 From: Julien Phalip Date: Mon, 2 Jan 2012 18:47:18 +0000 Subject: Fixed #10931 -- Made `Truncator` handle newlines properly. Thanks to gsong and Claude Paroz. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17329 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/text.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/utils') diff --git a/django/utils/text.py b/django/utils/text.py index 14555ddd0e..eaafb96d7c 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -18,8 +18,8 @@ capfirst = lambda x: x and force_unicode(x)[0].upper() + force_unicode(x)[1:] capfirst = allow_lazy(capfirst, unicode) # Set up regular expressions -re_words = re.compile(r'&.*?;|<.*?>|(\w[\w-]*)', re.U) -re_tag = re.compile(r'<(/)?([^ ]+?)(?: (/)| .*?)?>') +re_words = re.compile(r'&.*?;|<.*?>|(\w[\w-]*)', re.U|re.S) +re_tag = re.compile(r'<(/)?([^ ]+?)(?: (/)| .*?)?>', re.S) def wrap(text, width): -- cgit v1.3