Ticket #20364: 20364.diff

django/utils/html.py

@@ -17 +17 @@
 from django.utils.text import normalize_newlines
 
 # Configuration for urlize() function.
-TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)']
-WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'), ('&lt;', '&gt;')]
+TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)', '"', '\'']
+WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'), ('&lt;', '&gt;'), ('"', '"'), ('\'', '\'')]
 
 # List of possible strings used for bullets in bulleted lists.
 DOTS = ['&middot;', '*', '\u2022', '&#149;', '&bull;', '&#8226;']

tests/utils_tests/test_html.py

@@ -174 +174 @@
         )
         for value, tags, output in items:
             self.assertEqual(f(value, tags), output)
+
+    def test_urlize(self):
+        f = html.urlize
+        items = (
+            ("before \"hi@example.com\" afterwards", u'before "<a href="mailto:hi@example.com">hi@example.com</a>" afterwards'),
+        )
+        for value, output in items:
+            self.assertEqual(f(value), output)