diff options
| author | Tom Christie | 2013-04-03 09:21:04 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-04-03 09:21:04 +0100 |
| commit | a18d3df0f60ac4d5ad981b2d463f8408b44286ff (patch) | |
| tree | 8d6e881587a83fa843141a3f6cd84040dbd43e88 /rest_framework | |
| parent | 74fbd5ccc5b2aa2f0aab25ead5ffa36024079fcf (diff) | |
| parent | 5ed70324273d8093335f21155975267b22a641d2 (diff) | |
| download | django-rest-framework-a18d3df0f60ac4d5ad981b2d463f8408b44286ff.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/templatetags/rest_framework.py | 2 |
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 = [('(', ')'), ('<', '>'), ('[', ']'), ('<', '>'), ('"', '"'), ("'", "'")] 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+$') |