Ticket #11911: 11911.patch

tests/regressiontests/defaultfilters/tests.py

@@ -200 +200 @@
             u'<a href="http://31characteruri.com/test/"'\
             u' rel="nofollow">...</a>')
 
+        # Test url with brackets in it (#11911)
+
+        uri = 'http://en.wikipedia.org/wiki/Sibiu(Romania)'
+        self.assertEqual(urlizetrunc(uri, 200),
+            u'<a href="http://en.wikipedia.org/wiki/Sibiu%28Romania%29" '\
+            u'rel="nofollow">http://en.wikipedia.org/wiki/Sibiu(Romania)</a>')
+        self.assertEqual(urlizetrunc(uri, 40),
+            u'<a href="http://en.wikipedia.org/wiki/Sibiu%28Romania%29" '\
+            u'rel="nofollow">http://en.wikipedia.org/wiki/Sibiu(Ro...</a>')
+
     def test_urlize(self):
         # Check normal urlize
         self.assertEqual(urlize('http://google.com'),

django/utils/html.py

@@ -117 +117 @@
     If autoescape is True, the link text and URLs will get autoescaped.
     """
     trim_url = lambda x, limit=trim_url_limit: limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x
+    fix_trailing_bracket = lambda lead, middle, trail: (middle + ')', trail[1:]) if (trail.startswith(')') and not lead.endswith('(')) else (middle, trail)
     safe_input = isinstance(text, SafeData)
     words = word_split_re.split(force_unicode(text))
     nofollow_attr = nofollow and ' rel="nofollow"' or ''
@@ -129 +130 @@
             # Make URL we want to point to.
             url = None
             if middle.startswith('http://') or middle.startswith('https://'):
+                middle, trail = fix_trailing_bracket(lead, middle, trail)
                 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'))):
+                middle, trail = fix_trailing_bracket(lead, middle, trail)
                 url = urlquote('http://%s' % middle, safe='/&=:;#?+*')
             elif '@' in middle and not ':' in middle and simple_email_re.match(middle):
                 url = 'mailto:%s' % middle