Changeset Navigation

Changeset 1061

Timestamp:

04/22/06 17:48:26

Author:

fumanchu

Message:

Dispatchers shouldn't change request.object_path before calling the page handler. Moved that info into a new request.found_object_path variable.

Files:

r1055	r1061
305	305	handler, opath, vpath = self.find(request.browser_url, path)
306	306
307		# Remove "root" from opath and join it to get object_path
308		request.object_path = '/' + '/'.join(opath[1:])
	307	# Remove "root" from opath and join it to get found_object_path
	308	request.found_object_path = '/' + '/'.join(opath[1:])
309	309
310	310	# Decode any leftover %2F in the virtual_path atoms.

r1056	r1061
172	172	if not os.path.isabs(dir):
173	173	if not root:
174		msg = "Static ~~tool requires an absolute dir or root~~."
	174	msg = "Static dir requires an absolute dir (or root)."
175	175	raise cherrypy.WrongConfigValue(msg)
176	176	dir = os.path.join(root, dir)