From 0f834438227b483e1dd214575df0a8c0bf5e90ad Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Tue, 13 May 2014 22:56:15 +0200 Subject: [PATCH] fixed several pep8 issues * E122 continuation line missing indentation or outdented * E126 continuation line over-indented for hanging indent * E128 continuation line under-indented for visual indent * E265 block comment should start with '# ' Tested with pep8 version 1.5.6 (2014-04-14). Change-Id: Iaea72c74d3678061b0ac837eb8fe8c85a883bb4a --- ceilometerclient/common/http.py | 2 +- ceilometerclient/exc.py | 2 +- ceilometerclient/shell.py | 2 +- ceilometerclient/tests/v2/test_alarms.py | 26 +++++++++++++----------- ceilometerclient/v1/meters.py | 4 ++-- ceilometerclient/v2/options.py | 2 +- ceilometerclient/v2/shell.py | 11 +++++----- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ceilometerclient/common/http.py b/ceilometerclient/common/http.py index cd940a12..d83745b9 100644 --- a/ceilometerclient/common/http.py +++ b/ceilometerclient/common/http.py @@ -21,7 +21,7 @@ import socket try: import ssl except ImportError: - #TODO(bcwaldon): Handle this failure more gracefully + # TODO(bcwaldon): Handle this failure more gracefully pass try: diff --git a/ceilometerclient/exc.py b/ceilometerclient/exc.py index f0620b1e..ecdbc1a7 100644 --- a/ceilometerclient/exc.py +++ b/ceilometerclient/exc.py @@ -147,7 +147,7 @@ class HTTPServiceUnavailable(HTTPException): code = 503 -#NOTE(bcwaldon): Build a mapping of HTTP codes to corresponding exception +# NOTE(bcwaldon): Build a mapping of HTTP codes to corresponding exception # classes _code_map = {} for obj_name in dir(sys.modules[__name__]): diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 7a028ace..7fb48f94 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -156,7 +156,7 @@ class CeilometerShell(object): parser.add_argument('--ceilometer-api-version', default=cliutils.env( - 'CEILOMETER_API_VERSION', default='2'), + 'CEILOMETER_API_VERSION', default='2'), help='Defaults to env[CEILOMETER_API_VERSION] ' 'or 2.') diff --git a/ceilometerclient/tests/v2/test_alarms.py b/ceilometerclient/tests/v2/test_alarms.py index 1644f206..bfa7f850 100644 --- a/ceilometerclient/tests/v2/test_alarms.py +++ b/ceilometerclient/tests/v2/test_alarms.py @@ -38,18 +38,20 @@ AN_ALARM = {u'alarm_actions': [u'http://site:8000/alarm'], u'period': 240.0, u'statistic': u'avg', u'threshold': 200.0, - u'comparison_operator': 'gt', - }, - u'time_constraints': [{u'name': u'cons1', - u'description': u'desc1', - u'start': u'0 11 * * *', - u'duration': 300, - u'timezone': u''}, - {u'name': u'cons2', - u'description': u'desc2', - u'start': u'0 23 * * *', - u'duration': 600, - u'timezone': ''}], + u'comparison_operator': 'gt'}, + u'time_constraints': [ + { + u'name': u'cons1', + u'description': u'desc1', + u'start': u'0 11 * * *', + u'duration': 300, + u'timezone': u''}, + { + u'name': u'cons2', + u'description': u'desc2', + u'start': u'0 23 * * *', + u'duration': 600, + u'timezone': ''}], u'timestamp': u'2013-05-09T13:41:23.085000', u'enabled': True, u'alarm_id': u'alarm-id', diff --git a/ceilometerclient/v1/meters.py b/ceilometerclient/v1/meters.py index 1d64fd35..e9cc7905 100644 --- a/ceilometerclient/v1/meters.py +++ b/ceilometerclient/v1/meters.py @@ -20,12 +20,12 @@ from ceilometerclient.common import base def _get_opt_path(simple_params=[], **kwargs): l = [] - #get simple paramters + # get simple paramters for key in simple_params: val = kwargs.get(key) if val: l.append(key + '=' + val) - #get metadata query paramters + # get metadata query paramters metaquery = kwargs.get('metaquery') if metaquery: l.extend(metaquery.split(':')) diff --git a/ceilometerclient/v2/options.py b/ceilometerclient/v2/options.py index e28e05b6..73bd2005 100644 --- a/ceilometerclient/v2/options.py +++ b/ceilometerclient/v2/options.py @@ -80,7 +80,7 @@ def cli_to_array(cli_query): frags = re.findall(r'([[a-zA-Z0-9_.]+)([><=])([^ -,\t\n\r\f\v]+)', string) return frags diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 961bd10e..0fe0d171 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -59,8 +59,8 @@ SIMPLE_OPERATORS = ["=", "!=", "<", "<=", '>', '>='] help='Field for group by.') @utils.arg('-a', '--aggregate', metavar='[<-]', action='append', default=[], help=('Function for data aggregation. ' - 'Available aggregates are: ' - '%s.' % ", ".join(AGGREGATES.keys()))) + 'Available aggregates are: ' + '%s.' % ", ".join(AGGREGATES.keys()))) def do_statistics(cc, args): '''List the statistics for a meter.''' aggregates = [] @@ -693,10 +693,9 @@ def do_event_list(cc, args={}): fields = ['message_id', 'event_type', 'generated', 'traits'] utils.print_list(events, fields, field_labels, formatters={ - 'traits': utils.nested_list_of_dict_formatter('traits', - ['name', - 'type', - 'value'])}) + 'traits': utils.nested_list_of_dict_formatter( + 'traits', ['name', 'type', 'value'] + )}) @utils.arg('-m', '--message_id', metavar='',