Navigation

← Previous Changeset
Next Changeset →

Changeset 1470

Timestamp:

11/27/05 16:08:51 (2 years ago)

Author:

adrian

Message:

Fixed #878 -- URLconf regex captures no longer have to be named groups. Old URLconfs (with named groups) still work. This is backwards-incompatible if you've defined custom middleware with a process_view function. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges

Files:

django/trunk/django/core/handlers/base.py (modified) (1 diff)
django/trunk/django/core/urlresolvers.py (modified) (3 diffs)
django/trunk/django/middleware/doc.py (modified) (1 diff)
django/trunk/django/utils/decorators.py (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

django/trunk/django/core/handlers/base.py

r1356	r1470
63	63	resolver = urlresolvers.RegexURLResolver(r'^/', ROOT_URLCONF)
64	64	try:
65		callback, ~~param_dict~~ = resolver.resolve(path)
	65	callback, callback_args, callback_kwargs = resolver.resolve(path)
66	66
67	67	# Apply view middleware
68	68	for middleware_method in self._view_middleware:
69		response = middleware_method(request, callback, ~~param_dict~~)
	69	response = middleware_method(request, callback, callback_args, callback_kwargs)
70	70	if response:
71	71	return response
72	72
73	73	try:
74		response = callback(request, **param_dict)
	74	response = callback(request, callback_args, *callback_kwargs)
75	75	except Exception, e:
76	76	# If the view raised an exception, run it through exception

django/trunk/django/core/urlresolvers.py

r1376	r1470
5	5	a string) and returns a tuple in this format:
6	6
7		(view_function, ~~dict_of_view_function_~~args)
	7	(view_function, function_args, function_kwargs)
8	8	"""
9	9
…	…
32	32	match = self.regex.search(path)
33	33	if match:
34		args = dict(match.groupdict(), **self.default_args)
	34	# If there are any named groups, use those as kwargs, ignoring
	35	# non-named groups. Otherwise, pass all non-named arguments as
	36	# positional arguments.
	37	kwargs = match.groupdict()
	38	if kwargs:
	39	args = ()
	40	if not kwargs:
	41	args = match.groups()
	42	# In both cases, pass any extra_kwargs as **kwargs.
	43	kwargs.update(self.default_args)
	44
35	45	try: # Lazily load self.func.
36		return self.func, args
	46	return self.func, args, kwargs
37	47	except AttributeError:
38	48	self.func = self.get_callback()
39		return self.func, args
	49	return self.func, args, kwargs
40	50
41	51	def get_callback(self):
…	…
67	77	else:
68	78	if sub_match:
69		return sub_match[0], ~~dict(match.groupdict(), **sub_match[1~~])
	79	return sub_match[0], sub_match[1], dict(match.groupdict(), **sub_match[2])
70	80	tried.append(pattern.regex.pattern)
71	81	raise Resolver404, {'tried': tried, 'path': new_path}

django/trunk/django/middleware/doc.py

r580	r1470
6	6	Adds an X-View header to internal HEAD requests -- used by the documentation system.
7	7	"""
8
9		def process_view(self, request, view_func, param_dict):
	8	def process_view(self, request, view_func, view_args, view_kwargs):
10	9	"""
11	10	If the request method is HEAD and the IP is internal, quickly return

django/trunk/django/utils/decorators.py

r1076	r1470
14	14	return result
15	15	if hasattr(middleware, 'process_view'):
16		result = middleware.process_view(request, view_func, **kwargs)
	16	result = middleware.process_view(request, view_func, args, *kwargs)
17	17	if result is not None:
18	18	return result

Code