Ticket #7355: urlize-https-fix-tests.diff

tests/regressiontests/defaultfilters/tests.py

@@ -166 +166 @@
->>> urlizetrunc(uri, 2)
-u'<a href="http://31characteruri.com/test/" rel="nofollow">...</a>'
-
+# Check normal urlize
+>>> url = 'https://google.com'
+>>> urlize(url)
+u'<a href="https://google.com" rel="nofollow">https://google.com</a>'
+
->>> wordcount('')
-0
-

django/utils/html.py

@@ -99 +99 @@
-         lead, middle, trail = match.groups()
-         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'))):
-             middle = 'http://%s' % middle