Changeset 3506

Timestamp:

07/31/06 21:57:08 (2 years ago)

Author:

adrian

Message:

Fixed #2370 -- It's now possible to pass default URLconf arguments to include(). Added docs, as well. Thanks for the patch, martin.glueck@gmail.com

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/conf/urls/defaults.py (modified) (1 diff)
• django/trunk/django/core/urlresolvers.py (modified) (3 diffs)
• django/trunk/docs/url_dispatch.txt (modified) (1 diff)

django/trunk/AUTHORS

@@ -71 +71 @@
-    gandalf@owca.info
-    Baishampayan Ghose
+    martin.glueck@gmail.com
-    Espen Grindhaug <http://grindhaug.org/>
-    Brant Harris

django/trunk/django/conf/urls/defaults.py

@@ -11 +11 @@
-    pattern_list = []
-    for t in tuples:
-
-
+
+
+
+
-        else:
-t[0], prefix and (prefix + '.' + t[1]) or t[1], *t[2:]
+regex, prefix and (prefix + '.' + view_or_include) or view_or_include, *default_kwargs
-    return pattern_list

django/trunk/django/core/urlresolvers.py

@@ -131 +131 @@
-
-class RegexURLResolver(object):
-
+, default_kwargs=None
-        # regex is a string representing a regular expression.
-        # urlconf_name is a string representing the module containing urlconfs.
@@ -137 +137 @@
-        self.urlconf_name = urlconf_name
-        self.callback = None
+        self.default_kwargs = default_kwargs or {}
-
-    def resolve(self, path):
@@ -150 +151 @@
-                else:
-                    if sub_match:
-
+
+
-                    tried.append(pattern.regex.pattern)
-            raise Resolver404, {'tried': tried, 'path': new_path}

django/trunk/docs/url_dispatch.txt

@@ -390 +390 @@
-.. _generic views: http://www.djangoproject.com/documentation/generic_views/
-.. _syndication framework: http://www.djangoproject.com/documentation/syndication/
+
+Passing extra options to ``include()``
+--------------------------------------
+
+**New in the Django development version.**
+
+Similarly, you can pass extra options to ``include()``. When you pass extra
+options to ``include()``, *each* line in the included URLconf will be passed
+the extra options.
+
+For example, these two URLconf sets are functionally identical:
+
+Set one::
+
+    # main.py
+    urlpatterns = patterns('',
+        (r'^blog/', include('inner'), {'blogid': 3}),
+    )
+
+    # inner.py
+    urlpatterns = patterns('',
+        (r'^archive/$', 'mysite.views.archive'),
+        (r'^about/$', 'mysite.views.about'),
+    )
+
+Set two::
+
+    # main.py
+    urlpatterns = patterns('',
+        (r'^blog/', include('inner')),
+    )
+
+    # inner.py
+    urlpatterns = patterns('',
+        (r'^archive/$', 'mysite.views.archive', {'blogid': 3}),
+        (r'^about/$', 'mysite.views.about', {'blogid': 3}),
+    )
+
+Note that extra options will *always* be passed to *every* line in the included
+URLconf, regardless of whether the line's view actually accepts those options
+as valid. For this reason, this technique is only useful if you're certain that
+every view in the the included URLconf accepts the extra options you're passing.