aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-12-16 00:50:20 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-12-23 12:26:34 +0100
commit3d9143323019e0793451eac60eef8e55c09f6c47 (patch)
treefad24f3460af09c155d6c61909d54d5864919d51 /mediagoblin/app.py
parent48cf435d718b47e33cb98b048e5b58d79a46b486 (diff)
downloadmediagoblin-3d9143323019e0793451eac60eef8e55c09f6c47.tar.lz
mediagoblin-3d9143323019e0793451eac60eef8e55c09f6c47.tar.xz
mediagoblin-3d9143323019e0793451eac60eef8e55c09f6c47.zip
Move things from routing.py to tools/routing.py
This stops a cyclic import. Move add_route, mount and endpoint_to_controller into tools/routing.py and change all callers.
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 207e9d2c..ff64f65c 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -17,7 +17,8 @@
import os
import logging
-from mediagoblin.routing import get_url_map, endpoint_to_controller
+from mediagoblin.routing import get_url_map
+from mediagoblin.tools.routing import endpoint_to_controller
from werkzeug.wrappers import Request
from werkzeug.exceptions import HTTPException, NotFound