diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2012-12-15 21:30:13 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2012-12-23 12:26:34 +0100 |
| commit | 7880f03e2d9074c151306cbbdd7a247a020d8b55 (patch) | |
| tree | 3c8417a2ca8fe139abb0d9fca2aa9f1baa36d617 | |
| parent | 3d9143323019e0793451eac60eef8e55c09f6c47 (diff) | |
| download | mediagoblin-7880f03e2d9074c151306cbbdd7a247a020d8b55.tar.lz mediagoblin-7880f03e2d9074c151306cbbdd7a247a020d8b55.tar.xz mediagoblin-7880f03e2d9074c151306cbbdd7a247a020d8b55.zip | |
Rewrite routing.py / get_url_map
Move most of the "init routing" code inside get_url_map().
Maybe not the best solution, but better than running the
init code directly at module load time.
| -rw-r--r-- | mediagoblin/routing.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 1cf82a02..a650f22f 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -18,27 +18,25 @@ import logging from mediagoblin.tools.routing import add_route, mount, url_map from mediagoblin.tools.pluginapi import PluginManager +from mediagoblin.admin.routing import admin_routes +from mediagoblin.auth.routing import auth_routes _log = logging.getLogger(__name__) def get_url_map(): + add_route('index', '/', 'mediagoblin.views:root_view') + mount('/auth', auth_routes) + mount('/a', admin_routes) + + import mediagoblin.submit.routing + import mediagoblin.user_pages.routing + import mediagoblin.edit.routing + import mediagoblin.webfinger.routing + import mediagoblin.listings.routing + for route in PluginManager().get_routes(): add_route(*route) return url_map - - -add_route('index', '/', 'mediagoblin.views:root_view') - -from mediagoblin.admin.routing import admin_routes -from mediagoblin.auth.routing import auth_routes -mount('/auth', auth_routes) -mount('/a', admin_routes) - -import mediagoblin.submit.routing -import mediagoblin.user_pages.routing -import mediagoblin.edit.routing -import mediagoblin.webfinger.routing -import mediagoblin.listings.routing |