Ticket #11911: 11911-and-12183.patch

django/utils/html.py

@@ -92 +92 @@
     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 ''
     for i, word in enumerate(words):
+        nofollow_attr = nofollow and ' rel="nofollow"' or ''
         match = None
         if '.' in word or '@' in word or ':' in word:
             match = punctuation_re.match(word)
@@ -104 +105 @@
             # 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