Ticket #6170: 6170.diff

django/core/urlresolvers.py

@@ -160 +160 @@
         language_code = get_language()
         if language_code not in self._regex_dict:
             if isinstance(self._regex, basestring):
-                compiled_regex = re.compile(self._regex, re.UNICODE)
+                regex = self._regex
             else:
                 regex = force_unicode(self._regex)
+            try:
                 compiled_regex = re.compile(regex, re.UNICODE)
+            except re.error, e:
+                raise ImproperlyConfigured(
+                    u'"%s" is not a valid regular expression: %s' %
+                    (regex, unicode(e)))
+
             self._regex_dict[language_code] = compiled_regex
         return self._regex_dict[language_code]
 

tests/regressiontests/urlpatterns_reverse/erroneous_urls.py

@@ -11 +11 @@
     url(r'uncallable/$', 'regressiontests.urlpatterns_reverse.views.uncallable'),
     # Module does not exist
     url(r'missing_outer/$', 'regressiontests.urlpatterns_reverse.missing_module.missing_view'),
+    # Regex contains an error
+    url(r'(regex_error/$', 'regressiontestes.urlpatterns_reverse.views.empty_view'),
 )

tests/regressiontests/urlpatterns_reverse/tests.py

@@ -511 +511 @@
         self.assertRaises(ViewDoesNotExist, self.client.get, '/missing_outer/')
         self.assertRaises(ViewDoesNotExist, self.client.get, '/uncallable/')
 
+    def test_erroneous_reverse(self):
+        # The regex error will be hit before NoReverseMatch can be raised
+        self.assertRaises(ImproperlyConfigured, reverse, 'asdf')
+