Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #7355 -- Modified urlize utility to handle https:// addresses. …

…Thanks for the report and patch, clint.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5da67a084ad6a814c867c3c374f7e869dffac29e 1 parent d943c19
@freakboy3742 freakboy3742 authored
View
2  django/utils/html.py
@@ -99,7 +99,7 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
lead, middle, trail = match.groups()
if safe_input:
middle = mark_safe(middle)
- if middle.startswith('www.') or ('@' not in middle and not middle.startswith('http://') and \
+ if middle.startswith('www.') or ('@' not in middle and not (middle.startswith('http://') or middle.startswith('https://')) and \
len(middle) > 0 and middle[0] in string.ascii_letters + string.digits and \
(middle.endswith('.org') or middle.endswith('.net') or middle.endswith('.com'))):
middle = 'http://%s' % middle
View
21 tests/regressiontests/defaultfilters/tests.py
@@ -166,6 +166,27 @@
>>> urlizetrunc(uri, 2)
u'<a href="http://31characteruri.com/test/" rel="nofollow">...</a>'
+# Check normal urlize
+>>> urlize('http://google.com')
+u'<a href="http://google.com" rel="nofollow">http://google.com</a>'
+
+>>> urlize('http://google.com/')
+u'<a href="http://google.com/" rel="nofollow">http://google.com/</a>'
+
+>>> urlize('www.google.com')
+u'<a href="http://www.google.com" rel="nofollow">http://www.google.com</a>'
+
+>>> urlize('djangoproject.org')
+u'<a href="http://djangoproject.org" rel="nofollow">http://djangoproject.org</a>'
+
+>>> urlize('info@djangoproject.org')
+u'<a href="mailto:info@djangoproject.org">info@djangoproject.org</a>'
+
+# Check urlize with https addresses
+>>> urlize('https://google.com')
+u'<a href="https://google.com" rel="nofollow">https://google.com</a>'
+
+
>>> wordcount('')
0
Please sign in to comment.
Something went wrong with that request. Please try again.