Ticket #3474: regex_flags_pass_to_patterns.patch

django/conf/urls/defaults.py

@@ -7 +7 @@
 
 include = lambda urlconf_module: [urlconf_module]
 
-def patterns(prefix, *tuples):
+def patterns(prefix, *tuples, **kwargs):
+    for key in kwargs.keys():# this is the only way otherwise one of tuples gets eaten
+        if key != 'flags':
+            raise ValueError("The only keyword argument patterns accepts is flags")
+    if 'flags' in kwargs:
+        flags = kwargs['flags']
+    else:
+        flags = 0
     pattern_list = []
     for t in tuples:
         regex, view_or_include = t[:2]
         default_kwargs = t[2:]
         if type(view_or_include) == list:
-            pattern_list.append(RegexURLResolver(regex, view_or_include[0], *default_kwargs))
+            pattern_list.append(RegexURLResolver(regex, view_or_include[0], flags=flags, *default_kwargs))
         else:
-            pattern_list.append(RegexURLPattern(regex, prefix and (prefix + '.' + view_or_include) or view_or_include, *default_kwargs))
+            pattern_list.append(RegexURLPattern(regex, prefix and (prefix + '.' + view_or_include) or view_or_include, flags=flags, *default_kwargs))
     return pattern_list

django/core/urlresolvers.py

@@ -88 +88 @@
         return str(value) # TODO: Unicode?
 
 class RegexURLPattern(object):
-    def __init__(self, regex, callback, default_args=None):
+    def __init__(self, regex, callback, default_args=None, flags=0):
         # regex is a string representing a regular expression.
         # callback is either a string like 'foo.views.news.stories.story_detail'
         # which represents the path to a module and a view function name, or a
         # callable object (view).
-        self.regex = re.compile(regex)
+        self.regex = re.compile(regex, flags)
         if callable(callback):
             self._callback = callback
         else:
@@ -144 +144 @@
         return reverse_helper(self.regex, *args, **kwargs)
 
 class RegexURLResolver(object):
-    def __init__(self, regex, urlconf_name, default_kwargs=None):
+    def __init__(self, regex, urlconf_name, default_kwargs=None, flags=0):
         # regex is a string representing a regular expression.
         # urlconf_name is a string representing the module containing urlconfs.
-        self.regex = re.compile(regex)
+        self.regex = re.compile(regex, flags)
         self.urlconf_name = urlconf_name
         self.callback = None
         self.default_kwargs = default_kwargs or {}

docs/url_dispatch.txt

@@ -148 +148 @@
 In both cases, it will pass any extra keyword arguments as keyword arguments.
 See "Passing extra options to view functions" below.
 
+Flags
+=====
+
+Flags to be used on the regular expressions in a patterns block can be passed to it via the keyword argument flags. The flags must be imported from python's built in ``re`` module. See `the contents of the re module`_ for a list of flags.
+
+.. _the contents of the re module: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
+
 What the URLconf searches against
 =================================
 
@@ -190 +197 @@
 ...where ``optional dictionary`` is optional. (See
 _`Passing extra options to view functions` below.)
 
+Finally, the keyword argument flags can be passed containing `regexp flags_`to
+be applied to each regular expression in that patterns block.
+
 handler404
 ----------
 
@@ -215 +225 @@
 A function that takes a full Python import path to another URLconf that should
 be "included" in this place. See _`Including other URLconfs` below.
 
+.. _regexp flags: http://docs.python.org/lib/node46.html#l2h-394
+
 Notes on capturing text in URLs
 ===============================