diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-03 21:27:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-03 21:27:52 +0000 |
| commit | 64aee0626b7924706ca774e14a16b859b2fa515a (patch) | |
| tree | 6868dd54c16558cb9be99c75d81431c03df47358 | |
| parent | 4d7c07bf1d5c27a98bf36228277892bded4e5ac8 (diff) | |
| parent | 39b20acc933cb0fdf73075ddb9a9d82665b84b23 (diff) | |
| download | keystone-64aee0626b7924706ca774e14a16b859b2fa515a.tar.gz keystone-64aee0626b7924706ca774e14a16b859b2fa515a.tar.xz keystone-64aee0626b7924706ca774e14a16b859b2fa515a.zip | |
Merge "pep8 v1.3.3 compliance (bug 1019498)"
| -rw-r--r-- | keystone/contrib/stats/core.py | 19 | ||||
| -rw-r--r-- | tools/test-requires | 2 |
2 files changed, 13 insertions, 8 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', diff --git a/tools/test-requires b/tools/test-requires index a6f60402..a7524c21 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -11,7 +11,7 @@ nose # for test discovery and console feedback nosexcover openstack.nose_plugin pylint # static code analysis -pep8==1.1 # checks for PEP8 code style compliance +pep8==1.3.3 # checks for PEP8 code style compliance Sphinx>=1.1.2 # required to build documentation unittest2 # backport of unittest lib in python 2.7 webtest # test wsgi apps without starting an http server |