Ticket #10834: ticket10834.diff

django/core/urlresolvers.py

@@ -195 +195 @@
                         return sub_match[0], sub_match[1], sub_match_dict
                     tried.append(pattern.regex.pattern)
             raise Resolver404, {'tried': tried, 'path': new_path}
-
+        raise Resolver404, {'path' : path }
+            
     def _get_urlconf_module(self):
         try:
             return self._urlconf_module

tests/regressiontests/urlresolvers/tests.py

@@ +1 @@
+import unittest
+from django.core.urlresolvers import Resolver404, resolve
+
+class EmptyRegexTestCase(unittest.TestCase):
+    def testBasic(self):
+        """
+        Verifies that we raise a Resolver404 if what we are resolving is 
+        not a regular expression. self.regex.search(path) returns None if
+        path is not a regular expression. We must never return None from
+        resolve, or we will get a TypeError further down the line.
+        
+        In response to ticket #10834.
+        """
+        non_regex = ["", "a", "\\", "."]
+        for test in non_regex:
+            self.assertRaises(Resolver404, resolve, test)
+ No newline at end of file