Ticket #16020: urlize_test.diff

tests/regressiontests/defaultfilters/tests.py

@@ -212 +212 @@
             u'<a href="http://djangoproject.org" rel="nofollow">djangoproject.org</a>')
         self.assertEqual(urlize('info@djangoproject.org'),
             u'<a href="mailto:info@djangoproject.org">info@djangoproject.org</a>')
-
+        
         # Check urlize with https addresses
         self.assertEqual(urlize('https://google.com'),
             u'<a href="https://google.com" rel="nofollow">https://google.com</a>')
+        # Check with escaped characters
+        self.assertEqual(urlize('http://google.com/django%20project'),
+            u'<a href="http://google.com/django%20project" rel="nofollow">http://google.com/django%20project</a>')
+        
 
     def test_wordcount(self):
         self.assertEqual(wordcount(''), 0)

django/utils/html.py

@@ -129 +129 @@
             # Make URL we want to point to.
             url = None
             if middle.startswith('http://') or middle.startswith('https://'):
-                url = urlquote(middle, safe='/&=:;#?+*')
+                url = urlquote(middle, safe='/&=:;#?+*%')
             elif middle.startswith('www.') or ('@' not in middle and \
                     middle and middle[0] in string.ascii_letters + string.digits and \
                     (middle.endswith('.org') or middle.endswith('.net') or middle.endswith('.com'))):
-                url = urlquote('http://%s' % middle, safe='/&=:;#?+*')
+                url = urlquote('http://%s' % middle, safe='/&=:;#?+*%')
             elif '@' in middle and not ':' in middle and simple_email_re.match(middle):
                 url = 'mailto:%s' % middle
                 nofollow_attr = ''