From c322aece44916ba0f3231275a1a8bd487ec3b4a7 Mon Sep 17 00:00:00 2001 From: Douglas Mendizabal Date: Wed, 4 Sep 2013 17:06:48 -0500 Subject: [PATCH] pep-8 fixes. --- barbicanclient/client.py | 4 ++-- barbicanclient/keep.py | 16 +++++++++------- barbicanclient/orders.py | 3 ++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/barbicanclient/client.py b/barbicanclient/client.py index 7e77eb32..81d2c6f9 100644 --- a/barbicanclient/client.py +++ b/barbicanclient/client.py @@ -79,8 +79,8 @@ class Client(object): raise ValueError('Barbican endpoint url must be provided, or ' 'must be available from auth_plugin') if tenant_id is None: - raise ValueError('Tenant ID must be provided, or must be available' - ' from auth_plugin') + raise ValueError('Tenant ID must be provided, or must be' + ' available from the auth_plugin') if endpoint.endswith('/'): self._barbican_url = endpoint[:-1] else: diff --git a/barbicanclient/keep.py b/barbicanclient/keep.py index 9f570c66..f81ff42d 100644 --- a/barbicanclient/keep.py +++ b/barbicanclient/keep.py @@ -80,10 +80,11 @@ class Keep: help='a human-friendly name.') create_parser.add_argument('--algorithm', '-a', default='aes', help='the algorithm to be used with the ' - 'requested key (default: %(default)s).') + 'requested key (default: ' + '%(default)s).') create_parser.add_argument('--bit-length', '-b', default=256, - help='the bit length of the requested secret' - ' key (default: %(default)s).', + help='the bit length of the requested' + ' secret key (default: %(default)s).', type=int) create_parser.add_argument('--mode', '-m', default='cbc', help='the algorithmm mode to be used with ' @@ -151,8 +152,9 @@ class Keep: action='store_true') get_parser.add_argument('--payload_content_type', '-t', default='text/plain', - help='the content type of the decrypted secret ' - '(default: %(default)s; only used for secrets)') + help='the content type of the decrypted' + ' secret (default: %(default)s; only used for' + ' secrets)') get_parser.set_defaults(func=self.get) def _add_list_args(self): @@ -192,8 +194,8 @@ class Keep: args.expiration) print order else: - self.parser.exit(status=1, message='ERROR: create is only supported' - ' for orders\n') + self.parser.exit(status=1, message='ERROR: create is only ' + 'supported for orders\n') def delete(self, args): if args.command == 'secret': diff --git a/barbicanclient/orders.py b/barbicanclient/orders.py index b7420048..27d52a59 100644 --- a/barbicanclient/orders.py +++ b/barbicanclient/orders.py @@ -120,7 +120,8 @@ class OrderManager(base.BaseEntityManager): :param offset: Offset orders to begin list :returns: list of Order objects """ - LOG.debug('Listing orders - offest {0} limit {1}'.format(offset, limit)) + LOG.debug('Listing orders - offest {0} limit {1}'.format(offset, + limit)) href = '{0}/{1}'.format(self.api.base_url, self.entity) params = {'limit': limit, 'offset': offset} resp = self.api.get(href, params)