summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-03 21:27:52 +0000
committerGerrit Code Review <review@openstack.org>2012-07-03 21:27:52 +0000
commit64aee0626b7924706ca774e14a16b859b2fa515a (patch)
tree6868dd54c16558cb9be99c75d81431c03df47358 /keystone
parent4d7c07bf1d5c27a98bf36228277892bded4e5ac8 (diff)
parent39b20acc933cb0fdf73075ddb9a9d82665b84b23 (diff)
downloadkeystone-64aee0626b7924706ca774e14a16b859b2fa515a.tar.gz
keystone-64aee0626b7924706ca774e14a16b859b2fa515a.tar.xz
keystone-64aee0626b7924706ca774e14a16b859b2fa515a.zip
Merge "pep8 v1.3.3 compliance (bug 1019498)"
Diffstat (limited to 'keystone')
-rw-r--r--keystone/contrib/stats/core.py19
1 files changed, 12 insertions, 7 deletions
diff --git a/keystone/contrib/stats/core.py b/keystone/contrib/stats/core.py
index a5973f3a..a479ee3c 100644
--- a/keystone/contrib/stats/core.py
+++ b/keystone/contrib/stats/core.py
@@ -62,12 +62,16 @@ class StatsExtension(wsgi.ExtensionRouter):
def add_routes(self, mapper):
stats_controller = StatsController()
- mapper.connect('/OS-STATS/stats', controller=stats_controller,
- action='get_stats',
- conditions=dict(method=['GET']))
- mapper.connect('/OS-STATS/stats', controller=stats_controller,
- action='reset_stats',
- conditions=dict(method=['DELETE']))
+ mapper.connect(
+ '/OS-STATS/stats',
+ controller=stats_controller,
+ action='get_stats',
+ conditions=dict(method=['GET']))
+ mapper.connect(
+ '/OS-STATS/stats',
+ controller=stats_controller,
+ action='reset_stats',
+ conditions=dict(method=['DELETE']))
class StatsController(wsgi.Application):
@@ -80,7 +84,8 @@ class StatsController(wsgi.Application):
def get_stats(self, context):
self.assert_admin(context)
- return {'OS-STATS:stats': [
+ return {
+ 'OS-STATS:stats': [
{
'type': 'identity',
'api': 'admin',