From 05501c5742c85d0e2c855a02800d1f50f9df6c3d Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 16 Dec 2012 00:45:57 +0100 Subject: Rewrite routing using new MGRoute class MGRoute subclasses Rule(): Rule doesn't have a way to tag extra data, like the controller function, we need. So MGRoute has a new attribute .gmg_controller, which holds this. Rewrite everything to use this new Rule variant and drop all the other stuff that mapped endpoints to controller functions, mostly. --- mediagoblin/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mediagoblin/app.py') diff --git a/mediagoblin/app.py b/mediagoblin/app.py index ff64f65c..936a354f 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -184,7 +184,7 @@ class MediaGoblinApp(object): mg_request.setup_user_in_request(request) try: - endpoint, url_values = map_adapter.match() + found_rule, url_values = map_adapter.match(return_rule=True) request.matchdict = url_values except HTTPException as exc: # Stop and render exception @@ -192,7 +192,7 @@ class MediaGoblinApp(object): request, exc, exc.get_description(environ))(environ, start_response) - controller = endpoint_to_controller(endpoint) + controller = endpoint_to_controller(found_rule) # pass the request through our meddleware classes try: -- cgit v1.2.3