openstack/keystone
Code Issues Proposed changes

Merge "pep8 v1.3.3 compliance (bug 1019498)"

Browse Source
This commit is contained in:
Jenkins 2012-07-03 21:27:52 +00:00 committed by Gerrit Code Review
commit 64aee0626b
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keystone/contrib/stats/core.py
View File

@ -62,10 +62,14 @@ class StatsExtension(wsgi.ExtensionRouter):
def add_routes(self, mapper): def add_routes(self, mapper):
stats_controller = StatsController() stats_controller = StatsController()
mapper.connect('/OS-STATS/stats', controller=stats_controller, mapper.connect(
'/OS-STATS/stats',
controller=stats_controller,
action='get_stats', action='get_stats',
conditions=dict(method=['GET'])) conditions=dict(method=['GET']))
mapper.connect('/OS-STATS/stats', controller=stats_controller, mapper.connect(
'/OS-STATS/stats',
controller=stats_controller,
action='reset_stats', action='reset_stats',
conditions=dict(method=['DELETE'])) conditions=dict(method=['DELETE']))
@ -80,7 +84,8 @@ class StatsController(wsgi.Application):
def get_stats(self, context): def get_stats(self, context):
self.assert_admin(context) self.assert_admin(context)
return {'OS-STATS:stats': [ return {
'OS-STATS:stats': [
{ {
'type': 'identity', 'type': 'identity',
'api': 'admin', 'api': 'admin',

2
tools/test-requires
View File

@ -11,7 +11,7 @@ nose # for test discovery and console feedback
nosexcover nosexcover
openstack.nose_plugin openstack.nose_plugin
pylint # static code analysis 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 Sphinx>=1.1.2 # required to build documentation
unittest2 # backport of unittest lib in python 2.7 unittest2 # backport of unittest lib in python 2.7
webtest # test wsgi apps without starting an http server webtest # test wsgi apps without starting an http server