This stops a cyclic import.
Move add_route, mount and endpoint_to_controller into
tools/routing.py and change all callers.
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
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from mediagoblin.routing import add_route
+from mediagoblin.tools.routing import add_route
add_route('mediagoblin.edit.profile', '/edit/profile/',
'mediagoblin.edit.views:edit_profile')
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from mediagoblin.routing import add_route
+from mediagoblin.tools.routing import add_route
add_route('mediagoblin.listings.tags_listing',
"/tag/<string:tag>/",
import logging
-from werkzeug.routing import Map, Rule
-from mediagoblin.tools.common import import_component
+from mediagoblin.tools.routing import add_route, mount, url_map
from mediagoblin.tools.pluginapi import PluginManager
_log = logging.getLogger(__name__)
-url_map = Map()
-
-view_functions = {}
-
-
-def endpoint_to_controller(endpoint):
- view_func = view_functions[endpoint]
-
- _log.debug('endpoint: {0} view_func: {1}'.format(endpoint, view_func))
-
- # import the endpoint, or if it's already a callable, call that
- if isinstance(view_func, basestring):
- view_func = import_component(view_func)
- view_functions[endpoint] = view_func
-
- return view_func
-
-
-def add_route(endpoint, url, controller):
- """
- Add a route to the url mapping
- """
- # 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})
-
- url_map.add(Rule(url, endpoint=endpoint))
-
-
-def mount(mountpoint, routes):
- """
- Mount a bunch of routes to this mountpoint
- """
- for endpoint, url, controller in routes:
- url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/'))
- add_route(endpoint, url, controller)
-
def get_url_map():
for route in PluginManager().get_routes():
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from mediagoblin.routing import add_route
+from mediagoblin.tools.routing import add_route
add_route('mediagoblin.submit.start',
'/submit/', 'mediagoblin.submit.views:submit_start')
--- /dev/null
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from werkzeug.routing import Map, Rule
+from mediagoblin.tools.common import import_component
+
+
+_log = logging.getLogger(__name__)
+
+url_map = Map()
+
+view_functions = {}
+
+
+def endpoint_to_controller(endpoint):
+ view_func = view_functions[endpoint]
+
+ _log.debug('endpoint: {0} view_func: {1}'.format(endpoint, view_func))
+
+ # import the endpoint, or if it's already a callable, call that
+ if isinstance(view_func, basestring):
+ view_func = import_component(view_func)
+ view_functions[endpoint] = view_func
+
+ return view_func
+
+
+def add_route(endpoint, url, controller):
+ """
+ Add a route to the url mapping
+ """
+ # 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})
+
+ url_map.add(Rule(url, endpoint=endpoint))
+
+
+def mount(mountpoint, routes):
+ """
+ Mount a bunch of routes to this mountpoint
+ """
+ for endpoint, url, controller in routes:
+ url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/'))
+ add_route(endpoint, url, controller)
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from mediagoblin.routing import add_route
+from mediagoblin.tools.routing import add_route
add_route('mediagoblin.user_pages.user_home',
'/u/<string:user>/', 'mediagoblin.user_pages.views:user_home')
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from mediagoblin.routing import add_route
+from mediagoblin.tools.routing import add_route
add_route('mediagoblin.webfinger.host_meta', '/.well-known/host-meta',
'mediagoblin.webfinger.views:host_meta')
projects / mediagoblin.git / commitdiff