Changeset 7701

Timestamp:

06/19/08 07:05:39 (3 months ago)

Author:

russellm

Message:

Fixed #7355 -- Modified urlize utility to handle https:// addresses. Thanks for the report and patch, clint.

Files:

• django/trunk/django/utils/html.py (modified) (1 diff)
• django/trunk/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)

django/trunk/django/utils/html.py

@@ -100 +100 @@
-            if safe_input:
-                middle = mark_safe(middle)
-middle.startswith('http://'
+(middle.startswith('http://') or middle.startswith('https://')
-                    len(middle) > 0 and middle[0] in string.ascii_letters + string.digits and \
-                    (middle.endswith('.org') or middle.endswith('.net') or middle.endswith('.com'))):

django/trunk/tests/regressiontests/defaultfilters/tests.py

@@ -167 +167 @@
-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