Navigation

Changeset 679

Timestamp:

06/15/08 15:40:40 (2 months ago)

Author:

sylvain

Message:

* Now correctly merged _cp_config at the class level
* Removed trailing print statement

Files:

r641	r679
23	23	## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	24
25		__version__ = '0.1.0'
	25	__version__ = '0.2.0'
26	26	__authors__ = ['Sylvain Hellegouarch']
27	27
28	28	__all__ = ['SelectorDispatcher']
29
	29	import inspect
30	30	import cherrypy
31	31	from cherrypy._cpdispatch import LateParamPageHandler
…	…
53	53	handler, svars, methods, matched = self.s.select(path_info,
54	54	cherrypy.request.method)
55		~~print handler, svars, methods, matched~~
56	55	unnamed, named = [], {}
57	56	for k, v in svars.iteritems():
…	…
86	85	if curpath in app.config:
87	86	merge(app.config[curpath])
88
	87
	88
89	89	if handler not in [self.s.status404, self.s.status405]:
	90	if inspect.ismethod(handler):
	91	members = inspect.getmembers(handler)
	92	for name, member in members:
	93	if name == 'im_self':
	94	if hasattr(member, '_cp_config'):
	95	merge(member._cp_config)
	96	break
90	97	if hasattr(handler, "_cp_config"):
91	98	merge(handler._cp_config)
…	…
128	135	disp.add('/some/', GET=ev)
129	136
130		conf = {'/' : {'request.dispatch': disp},
131		}
	137	conf = {'/' : {'request.dispatch': disp}}
132	138	cherrypy.tree.mount(root, '/', config=conf)
133	139	cherrypy.tree.graft(disp.s, '/some')

r583	r679
25	25
26	26	setup(name = "selector4cherrypy",
27		version = '0.1.0',
	27	version = '0.2.0',
28	28	description = "Selector dispatcher for CherryPy 3",
29	29	maintainer = "Sylvain Hellegouarch",