aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglic3rinu2013-04-01 20:15:05 +0200
committerglic3rinu2013-04-01 20:15:05 +0200
commit76d1c47905680fafa32596d1dda8d9ae20827acf (patch)
treeaec6a9c92b3c1ea2bffbe89c525b6d35b8ad8cdc
parent7d7c03eb2464110c281ce35e5cc73f02c349068d (diff)
downloaddjango-rest-framework-76d1c47905680fafa32596d1dda8d9ae20827acf.tar.bz2
Fixed IPv6 support for urlize_quoted_links
-rw-r--r--rest_framework/templatetags/rest_framework.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index b6ab2de3..1d7a499f 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -181,7 +181,7 @@ TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)', '"', "'"]
WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'), ('&lt;', '&gt;'),
('"', '"'), ("'", "'")]
word_split_re = re.compile(r'(\s+)')
-simple_url_re = re.compile(r'^https?://\w', re.IGNORECASE)
+simple_url_re = re.compile(r'^https?://\[?\w', re.IGNORECASE)
simple_url_2_re = re.compile(r'^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org)$', re.IGNORECASE)
simple_email_re = re.compile(r'^\S+@\S+\.\S+$')