aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2012-10-15 00:12:58 +0200
committerJoar Wandborg <git@wandborg.com>2012-10-15 22:59:53 +0200
commitd56e82635f85f7a8a7d184a3eae539c09a7b001d (patch)
tree04c1c07fd834027a4753b1697bf9701e2de94760 /mediagoblin/plugins
parent0d857844b12b033ee8ecdbcfa474781f835bee59 (diff)
downloadmediagoblin-d56e82635f85f7a8a7d184a3eae539c09a7b001d.tar.lz
mediagoblin-d56e82635f85f7a8a7d184a3eae539c09a7b001d.tar.xz
mediagoblin-d56e82635f85f7a8a7d184a3eae539c09a7b001d.zip
Fixed OAuth access_token duplicate route
Changed route name to "[...]list_connections"
Diffstat (limited to 'mediagoblin/plugins')
-rw-r--r--mediagoblin/plugins/api/__init__.py9
-rw-r--r--mediagoblin/plugins/oauth/__init__.py11
2 files changed, 13 insertions, 7 deletions
diff --git a/mediagoblin/plugins/api/__init__.py b/mediagoblin/plugins/api/__init__.py
index f370cca6..3b7ced0c 100644
--- a/mediagoblin/plugins/api/__init__.py
+++ b/mediagoblin/plugins/api/__init__.py
@@ -33,11 +33,14 @@ def setup_plugin():
_log.debug('API config: {0}'.format(config))
routes = [
- ('mediagoblin.plugins.api.test', '/api/test',
+ ('mediagoblin.plugins.api.test',
+ '/api/test',
'mediagoblin.plugins.api.views:api_test'),
- ('mediagoblin.plugins.api.entries', '/api/entries',
+ ('mediagoblin.plugins.api.entries',
+ '/api/entries',
'mediagoblin.plugins.api.views:get_entries'),
- ('mediagoblin.plugins.api.post_entry', '/api/submit',
+ ('mediagoblin.plugins.api.post_entry',
+ '/api/submit',
'mediagoblin.plugins.api.views:post_entry')]
pluginapi.register_routes(routes)
diff --git a/mediagoblin/plugins/oauth/__init__.py b/mediagoblin/plugins/oauth/__init__.py
index 64acf0e7..3ed695de 100644
--- a/mediagoblin/plugins/oauth/__init__.py
+++ b/mediagoblin/plugins/oauth/__init__.py
@@ -36,13 +36,16 @@ def setup_plugin():
_log.debug('OAuth config: {0}'.format(config))
routes = [
- ('mediagoblin.plugins.oauth.authorize', '/oauth/authorize',
+ ('mediagoblin.plugins.oauth.authorize',
+ '/oauth/authorize',
'mediagoblin.plugins.oauth.views:authorize'),
- ('mediagoblin.plugins.oauth.authorize_client', '/oauth/client/authorize',
+ ('mediagoblin.plugins.oauth.authorize_client',
+ '/oauth/client/authorize',
'mediagoblin.plugins.oauth.views:authorize_client'),
- ('mediagoblin.plugins.oauth.access_token', '/oauth/access_token',
- 'mediagoblin.plugins.oauth.views:access_token'),
('mediagoblin.plugins.oauth.access_token',
+ '/oauth/access_token',
+ 'mediagoblin.plugins.oauth.views:access_token'),
+ ('mediagoblin.plugins.oauth.list_connections',
'/oauth/client/connections',
'mediagoblin.plugins.oauth.views:list_connections'),
('mediagoblin.plugins.oauth.register_client',