Context Navigation

Ticket #17576: 17576.patch

File 17576.patch, 2.0 KB (added by Aymeric Augustin, 12 years ago)

diff --git a/django/utils/html.py b/django/utils/html.py
index a9ebd17..1f48ca7 100644

                from django.utils.text import normalize_newlines
 # Configuration for urlize() function.
 TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)']
 WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'), ('&lt;', '&gt;')]
+WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'), ('&lt;', '&gt;'), ('"', '"'), ("'", "'")]
 # List of possible strings used for bullets in bulleted lists.
 DOTS = ['&middot;', '*', '\u2022', '&#149;', '&bull;', '&#8226;']
-…
+               def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
                     lead = lead + opening
                 # Keep parentheses at the end only if they're balanced.
                 if (middle.endswith(closing)
                     and middle.count(closing) == middle.count(opening) + 1):
+                    and (opening == closing or middle.count(closing) == middle.count(opening) + 1)):
                     middle = middle[:-len(closing)]
                     trail = closing + trail

diff --git a/tests/defaultfilters/tests.py b/tests/defaultfilters/tests.py
index 8596f8c..0092f4d 100644

                class DefaultFiltersTests(TestCase):
         self.assertEqual(urlize('see test[at[example.com'),
             'see <a href="http://test[at[example.com" rel="nofollow">test[at[example.com</a>' )
+        # Check urlize handles quoted URLs properly (#17576)
+        self.assertEqual(urlize('{"link": "www.djangoproject.com"}'),
+            '{"link": "<a href="http://www.djangoproject.com" rel="nofollow">www.djangoproject.com</a>"}')
+        self.assertEqual(urlize("{'link': 'www.djangoproject.com'}"),
+            "{'link': '<a href=\"http://www.djangoproject.com\" rel=\"nofollow\">www.djangoproject.com</a>'}")
     def test_wordcount(self):
         self.assertEqual(wordcount(''), 0)