p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #21573 -- Improved performance of utils.text.normalize_newlines.

This commit is contained in:
Vajrasky Kok 2013-12-07 16:54:50 +08:00 committed by Baptiste Mispelon
parent 65faa84de3
commit a7cf48a2b7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/utils/text.py
View File

@ -24,6 +24,7 @@ capfirst = allow_lazy(capfirst, six.text_type)
# Set up regular expressions # Set up regular expressions
re_words = re.compile(r'<.*?>|((?:\w[-\w]*|&.*?;)+)', re.U | re.S) re_words = re.compile(r'<.*?>|((?:\w[-\w]*|&.*?;)+)', re.U | re.S)
re_tag = re.compile(r'<(/)?([^ ]+?)(?:(\s*/)| .*?)?>', re.S) re_tag = re.compile(r'<(/)?([^ ]+?)(?:(\s*/)| .*?)?>', re.S)
re_newlines = re.compile(r'\r\n|\r') # Used in normalize_newlines
def wrap(text, width): def wrap(text, width):
@ -249,7 +250,7 @@ get_text_list = allow_lazy(get_text_list, six.text_type)
def normalize_newlines(text): def normalize_newlines(text):
return force_text(re.sub(r'\r\n|\r|\n', '\n', text)) return force_text(re_newlines.sub('\n', text))
normalize_newlines = allow_lazy(normalize_newlines, six.text_type) normalize_newlines = allow_lazy(normalize_newlines, six.text_type)