Changeset Navigation

Changeset 562

Timestamp:

08/27/05 13:06:43

Author:

fumanchu

Message:

Cleaned _cphttptools.main() for more-readable tracebacks.

Files:

r561	r562
491	491	while True:
492	492	try:
493		~~func, objectPathList, virtualPathList~~ = mapPathToObject(path)
	493	page_handler, object_path, virtual_path = mapPathToObject(path)
494	494
495		# Remove "root" from object~~PathList~~ and join it to get objectPath
496		cherrypy.request.objectPath = '/' + '/'.join(object~~PathList~~[1:])
	495	# Remove "root" from object_path and join it to get objectPath
	496	cherrypy.request.objectPath = '/' + '/'.join(object_path[1:])
497	497	try:
498		~~body = func(*(virtualPathList + cherrypy.request.paramList),~~
499		**(cherrypy.request.paramMap))
	498	args = virtual_path + cherrypy.request.paramList
	499	body = page_handler(args, *cherrypy.request.paramMap)
500	500	except TypeError, x:
501	501	m = re.match(r"(.)\(\) got an unexpected keyword argument '(.)'", x.args[0])
…	…
504	504	msg = ("The '%s' page handler received a '%s' parameter, "
505	505	"which it does not handle." % (fname, pname))
506		raise TypeError(msg, repr(~~func~~))
	506	raise TypeError(msg, repr(page_handler))
507	507	cherrypy.response.body = iterable(body)
508	508	return