From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Tue, 20 Nov 2012 08:25:41 +0000 (+0100)
Subject: Purge routes package from MG (#507)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=60389b21f5d24acf6faf08c225da16b3f8d7de18;p=mediagoblin.git

Purge routes package from MG (#507)

We were not actually using the routes package anymore, but it was
still mentioned in the documention. Adapt the plugin documentation to
actually represent reality, although I don't like the API design.
(but this is for another day)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
---

diff --git a/docs/source/siteadmin/codebase.rst b/docs/source/siteadmin/codebase.rst
index 3ef91290..22f4e18b 100644
--- a/docs/source/siteadmin/codebase.rst
+++ b/docs/source/siteadmin/codebase.rst
@@ -68,8 +68,6 @@ Software Stack
   * `WebOb <http://pythonpaste.org/webob/>`_: nice abstraction layer
     from HTTP requests, responses and WSGI bits
 
-  * `Routes <http://routes.groovie.org/>`_: for URL routing
-
   * `Beaker <http://beaker.groovie.org/>`_: for handling sessions and
     caching
 
diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py
index 1752dfc8..38ab631b 100644
--- a/mediagoblin/tools/pluginapi.py
+++ b/mediagoblin/tools/pluginapi.py
@@ -145,16 +145,14 @@ def register_routes(routes):
 
     Example passing in a single route:
 
-    >>> from routes import Route
-    >>> register_routes(Route('about-view', '/about',
-    ...     controller=about_view_handler))
+    >>> register_routes(('about-view', '/about',
+    ...     'mediagoblin.views:about_view_handler'))
 
     Example passing in a list of routes:
 
-    >>> from routes import Route
     >>> register_routes([
-    ...     Route('contact-view', '/contact', controller=contact_handler),
-    ...     Route('about-view', '/about', controller=about_handler)
+    ...     ('contact-view', '/contact', 'mediagoblin.views:contact_handler'),
+    ...     ('about-view', '/about', 'mediagoblin.views:about_handler')
     ... ])