Skip to content

Commit 329296c

Browse files
stephenfinstephenfin
committed
Blacken openstackclient.object
Black used with the '-l 79 -S' flags. A future change will ignore this commit in git-blame history by adding a 'git-blame-ignore-revs' file. Change-Id: I6658e76d7d1f93149f24fcab28d593195b37779f Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
1 parent aed521d commit 329296c

11 files changed

Lines changed: 300 additions & 281 deletions

File tree

‎openstackclient/object/client.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ def build_option_parser(parser):
5050
'--os-object-api-version',
5151
metavar='<object-api-version>',
5252
default=utils.env('OS_OBJECT_API_VERSION'),
53-
help='Object API version, default=' +
54-
DEFAULT_API_VERSION +
55-
' (Env: OS_OBJECT_API_VERSION)')
53+
help='Object API version, default='
54+
+ DEFAULT_API_VERSION
55+
+ ' (Env: OS_OBJECT_API_VERSION)',
56+
)
5657
return parser

‎openstackclient/object/v1/account.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ def get_parser(self, prog_name):
3030
metavar="<key=value>",
3131
required=True,
3232
action=parseractions.KeyValueAction,
33-
help=_("Set a property on this account "
34-
"(repeat option to set multiple properties)")
33+
help=_(
34+
"Set a property on this account "
35+
"(repeat option to set multiple properties)"
36+
),
3537
)
3638
return parser
3739

@@ -48,7 +50,8 @@ def take_action(self, parsed_args):
4850
data = self.app.client_manager.object_store.account_show()
4951
if 'properties' in data:
5052
data['properties'] = format_columns.DictColumn(
51-
data.pop('properties'))
53+
data.pop('properties')
54+
)
5255
return zip(*sorted(data.items()))
5356

5457

@@ -63,8 +66,10 @@ def get_parser(self, prog_name):
6366
required=True,
6467
action='append',
6568
default=[],
66-
help=_('Property to remove from account '
67-
'(repeat option to remove multiple properties)'),
69+
help=_(
70+
'Property to remove from account '
71+
'(repeat option to remove multiple properties)'
72+
),
6873
)
6974
return parser
7075

‎openstackclient/object/v1/container.py‎

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ def get_parser(self, prog_name):
3737
'--public',
3838
action='store_true',
3939
default=False,
40-
help="Make the container publicly accessible"
40+
help="Make the container publicly accessible",
4141
)
4242
parser.add_argument(
4343
'--storage-policy',
44-
help="Specify a particular storage policy to use."
44+
help="Specify a particular storage policy to use.",
4545
)
4646
parser.add_argument(
4747
'containers',
@@ -52,26 +52,33 @@ def get_parser(self, prog_name):
5252
return parser
5353

5454
def take_action(self, parsed_args):
55-
5655
results = []
5756
for container in parsed_args.containers:
5857
if len(container) > 256:
59-
LOG.warning(
60-
_('Container name is %s characters long, the default limit'
61-
' is 256'), len(container))
58+
msg = _(
59+
'Container name is %d characters long, the default limit'
60+
' is 256'
61+
)
62+
LOG.warning(msg, len(container))
6263
data = self.app.client_manager.object_store.container_create(
6364
container=container,
6465
public=parsed_args.public,
65-
storage_policy=parsed_args.storage_policy
66+
storage_policy=parsed_args.storage_policy,
6667
)
6768
results.append(data)
6869

6970
columns = ("account", "container", "x-trans-id")
70-
return (columns,
71-
(utils.get_dict_properties(
72-
s, columns,
71+
return (
72+
columns,
73+
(
74+
utils.get_dict_properties(
75+
s,
76+
columns,
7377
formatters={},
74-
) for s in results))
78+
)
79+
for s in results
80+
),
81+
)
7582

7683

7784
class DeleteContainer(command.Command):
@@ -80,7 +87,8 @@ class DeleteContainer(command.Command):
8087
def get_parser(self, prog_name):
8188
parser = super(DeleteContainer, self).get_parser(prog_name)
8289
parser.add_argument(
83-
'--recursive', '-r',
90+
'--recursive',
91+
'-r',
8492
action='store_true',
8593
default=False,
8694
help=_('Recursively delete objects and container'),
@@ -94,11 +102,11 @@ def get_parser(self, prog_name):
94102
return parser
95103

96104
def take_action(self, parsed_args):
97-
98105
for container in parsed_args.containers:
99106
if parsed_args.recursive:
100107
objs = self.app.client_manager.object_store.object_list(
101-
container=container)
108+
container=container
109+
)
102110
for obj in objs:
103111
self.app.client_manager.object_store.object_delete(
104112
container=container,
@@ -150,7 +158,6 @@ def get_parser(self, prog_name):
150158
return parser
151159

152160
def take_action(self, parsed_args):
153-
154161
if parsed_args.long:
155162
columns = ('Name', 'Bytes', 'Count')
156163
else:
@@ -168,15 +175,19 @@ def take_action(self, parsed_args):
168175
if parsed_args.all:
169176
kwargs['full_listing'] = True
170177

171-
data = self.app.client_manager.object_store.container_list(
172-
**kwargs
173-
)
178+
data = self.app.client_manager.object_store.container_list(**kwargs)
174179

175-
return (columns,
176-
(utils.get_dict_properties(
177-
s, columns,
180+
return (
181+
columns,
182+
(
183+
utils.get_dict_properties(
184+
s,
185+
columns,
178186
formatters={},
179-
) for s in data))
187+
)
188+
for s in data
189+
),
190+
)
180191

181192

182193
class SaveContainer(command.Command):
@@ -212,8 +223,10 @@ def get_parser(self, prog_name):
212223
metavar="<key=value>",
213224
required=True,
214225
action=parseractions.KeyValueAction,
215-
help=_("Set a property on this container "
216-
"(repeat option to set multiple properties)")
226+
help=_(
227+
"Set a property on this container "
228+
"(repeat option to set multiple properties)"
229+
),
217230
)
218231
return parser
219232

@@ -237,7 +250,6 @@ def get_parser(self, prog_name):
237250
return parser
238251

239252
def take_action(self, parsed_args):
240-
241253
data = self.app.client_manager.object_store.container_show(
242254
container=parsed_args.container,
243255
)
@@ -263,8 +275,10 @@ def get_parser(self, prog_name):
263275
required=True,
264276
action='append',
265277
default=[],
266-
help=_('Property to remove from container '
267-
'(repeat option to remove multiple properties)'),
278+
help=_(
279+
'Property to remove from container '
280+
'(repeat option to remove multiple properties)'
281+
),
268282
)
269283
return parser
270284

‎openstackclient/object/v1/object.py‎

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,31 @@ def get_parser(self, prog_name):
4848
parser.add_argument(
4949
'--name',
5050
metavar='<name>',
51-
help=_('Upload a file and rename it. '
52-
'Can only be used when uploading a single object')
51+
help=_(
52+
'Upload a file and rename it. '
53+
'Can only be used when uploading a single object'
54+
),
5355
)
5456
return parser
5557

5658
def take_action(self, parsed_args):
5759
if parsed_args.name:
5860
if len(parsed_args.objects) > 1:
59-
msg = _('Attempting to upload multiple objects and '
60-
'using --name is not permitted')
61+
msg = _(
62+
'Attempting to upload multiple objects and '
63+
'using --name is not permitted'
64+
)
6165
raise exceptions.CommandError(msg)
6266
results = []
6367
for obj in parsed_args.objects:
6468
if len(obj) > 1024:
6569
LOG.warning(
66-
_('Object name is %s characters long, default limit'
67-
' is 1024'), len(obj))
70+
_(
71+
'Object name is %s characters long, default limit'
72+
' is 1024'
73+
),
74+
len(obj),
75+
)
6876
data = self.app.client_manager.object_store.object_create(
6977
container=parsed_args.container,
7078
object=obj,
@@ -73,11 +81,17 @@ def take_action(self, parsed_args):
7381
results.append(data)
7482

7583
columns = ("object", "container", "etag")
76-
return (columns,
77-
(utils.get_dict_properties(
78-
s, columns,
84+
return (
85+
columns,
86+
(
87+
utils.get_dict_properties(
88+
s,
89+
columns,
7990
formatters={},
80-
) for s in results))
91+
)
92+
for s in results
93+
),
94+
)
8195

8296

8397
class DeleteObject(command.Command):
@@ -99,7 +113,6 @@ def get_parser(self, prog_name):
99113
return parser
100114

101115
def take_action(self, parsed_args):
102-
103116
for obj in parsed_args.objects:
104117
self.app.client_manager.object_store.object_delete(
105118
container=parsed_args.container,
@@ -158,7 +171,6 @@ def get_parser(self, prog_name):
158171
return parser
159172

160173
def take_action(self, parsed_args):
161-
162174
if parsed_args.long:
163175
columns = (
164176
'Name',
@@ -185,15 +197,20 @@ def take_action(self, parsed_args):
185197
kwargs['full_listing'] = True
186198

187199
data = self.app.client_manager.object_store.object_list(
188-
container=parsed_args.container,
189-
**kwargs
200+
container=parsed_args.container, **kwargs
190201
)
191202

192-
return (columns,
193-
(utils.get_dict_properties(
194-
s, columns,
203+
return (
204+
columns,
205+
(
206+
utils.get_dict_properties(
207+
s,
208+
columns,
195209
formatters={},
196-
) for s in data))
210+
)
211+
for s in data
212+
),
213+
)
197214

198215

199216
class SaveObject(command.Command):
@@ -204,8 +221,10 @@ def get_parser(self, prog_name):
204221
parser.add_argument(
205222
"--file",
206223
metavar="<filename>",
207-
help=_("Destination filename (defaults to object name); using '-'"
208-
" as the filename will print the file to stdout"),
224+
help=_(
225+
"Destination filename (defaults to object name); using '-'"
226+
" as the filename will print the file to stdout"
227+
),
209228
)
210229
parser.add_argument(
211230
'container',
@@ -247,8 +266,10 @@ def get_parser(self, prog_name):
247266
metavar="<key=value>",
248267
required=True,
249268
action=parseractions.KeyValueAction,
250-
help=_("Set a property on this object "
251-
"(repeat option to set multiple properties)")
269+
help=_(
270+
"Set a property on this object "
271+
"(repeat option to set multiple properties)"
272+
),
252273
)
253274
return parser
254275

@@ -278,7 +299,6 @@ def get_parser(self, prog_name):
278299
return parser
279300

280301
def take_action(self, parsed_args):
281-
282302
data = self.app.client_manager.object_store.object_show(
283303
container=parsed_args.container,
284304
object=parsed_args.object,
@@ -310,8 +330,10 @@ def get_parser(self, prog_name):
310330
required=True,
311331
action='append',
312332
default=[],
313-
help=_('Property to remove from object '
314-
'(repeat option to remove multiple properties)'),
333+
help=_(
334+
'Property to remove from object '
335+
'(repeat option to remove multiple properties)'
336+
),
315337
)
316338
return parser
317339

‎openstackclient/tests/functional/object/v1/test_container.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
class ContainerTests(common.ObjectStoreTests):
2020
"""Functional tests for Object Store container commands"""
21+
2122
NAME = uuid.uuid4().hex
2223

2324
@classmethod

0 commit comments

Comments
 (0)