diff options
author | Joar Wandborg <git@wandborg.com> | 2012-10-20 12:09:23 +0200 |
---|---|---|
committer | Joar Wandborg <git@wandborg.com> | 2012-10-20 12:35:03 +0200 |
commit | 5b60ec41ee5d0f25d66190b2a0114a8e1b216f86 (patch) | |
tree | 4a3f85cd4242facbb925b4d707807aab64cad2d8 /mediagoblin/routing.py | |
parent | 54397b90633b350984dc72ce192b2e2373203463 (diff) | |
download | mediagoblin-5b60ec41ee5d0f25d66190b2a0114a8e1b216f86.tar.lz mediagoblin-5b60ec41ee5d0f25d66190b2a0114a8e1b216f86.tar.xz mediagoblin-5b60ec41ee5d0f25d66190b2a0114a8e1b216f86.zip |
Removed Routes dependency, added admin routes
Diffstat (limited to 'mediagoblin/routing.py')
-rw-r--r-- | mediagoblin/routing.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index b61a3626..defbc4ba 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -24,7 +24,10 @@ def add_route(endpoint, url, controller): """ Add a route to the url mapping """ - #assert endpoint not in view_functions.keys(), 'Trying to overwrite a rule' + # XXX: We cannot use this, since running tests means that the plugin + # routes will be populated over and over over the same session. + # + # assert endpoint not in view_functions.keys(), 'Trying to overwrite a rule' view_functions.update({endpoint: controller}) @@ -40,11 +43,13 @@ def mount(mountpoint, routes): 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 - -from mediagoblin.auth.routing import auth_routes -mount('/auth', auth_routes) |