diff options
| author | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
|---|---|---|
| committer | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
| commit | 1d0148aef1493467dacb6c39c4e080ee4a5246d2 (patch) | |
| tree | 5213418660d4e079eb8dac6bc8ea2e4fdc140088 /mediagoblin/plugins/flatpagesfile/__init__.py | |
| parent | 200433dc38a2139462e0331be36ee49a80a81a12 (diff) | |
| parent | 5c99cd01a70f2d597ac7669e8d944ddf79b05281 (diff) | |
| download | mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.lz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.xz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Conflicts:
docs/source/siteadmin/media-types.rst
Diffstat (limited to 'mediagoblin/plugins/flatpagesfile/__init__.py')
| -rw-r--r-- | mediagoblin/plugins/flatpagesfile/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mediagoblin/plugins/flatpagesfile/__init__.py b/mediagoblin/plugins/flatpagesfile/__init__.py index b9b52012..3d797809 100644 --- a/mediagoblin/plugins/flatpagesfile/__init__.py +++ b/mediagoblin/plugins/flatpagesfile/__init__.py @@ -19,7 +19,6 @@ import logging import os import jinja2 -from routes.route import Route from mediagoblin.tools import pluginapi from mediagoblin.tools.response import render_to_response @@ -68,7 +67,7 @@ def setup_plugin(): name = 'flatpagesfile.%s' % name.strip() controller = flatpage_handler_builder(template) routes.append( - Route(name, url, controller=controller)) + (name, url, controller)) pluginapi.register_routes(routes) _log.info('Done setting up flatpagesfile!') |