Ticket #13704: django.2.diff

django/utils/html.py

@@ -2 +2 @@
 
 import re
 import string
+from urlparse import urlparse, urlunparse
 
 from django.utils.safestring import SafeData, mark_safe
 from django.utils.encoding import force_unicode
@@ -104 +105 @@
             # Make URL we want to point to.
             url = None
             if middle.startswith('http://') or middle.startswith('https://'):
+                try:
+                    middle = urlparse(middle)
+                    middle = urlunparse( ( middle.scheme, middle.netloc.encode('idna'), middle.path, middle.params, middle.query, middle.fragment ) )
+                except ValueError:
+                    pass
                 url = urlquote(middle, safe='/&=:;#?+*')
             elif middle.startswith('www.') or ('@' not in middle and \
                     middle and middle[0] in string.ascii_letters + string.digits and \