Skip to content

Commit f98006c

Browse files
stephenfinstephenfin
committed
pre-commit: Migrate pyupgrade to ruff
Change-Id: Ic50d2a5e0bc9dcdfe29f382607135cab510cd396 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent fc6852c commit f98006c

File tree

79 files changed

+753
-1190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+753
-1190
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,11 @@ repos:
1414
- id: check-yaml
1515
files: .*\.(yaml|yml)$
1616
args: ['--unsafe']
17-
- repo: https://github.com/asottile/pyupgrade
18-
rev: v3.17.0
19-
hooks:
20-
- id: pyupgrade
21-
args: ['--py38-plus']
2217
- repo: https://github.com/astral-sh/ruff-pre-commit
2318
rev: v0.6.2
2419
hooks:
2520
- id: ruff
26-
args: ['--fix']
21+
args: ['--fix', '--unsafe-fixes']
2722
- id: ruff-format
2823
- repo: https://opendev.org/openstack/hacking
2924
rev: 7.0.0

‎examples/common.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ def run(opts):
241241

242242
# Do some basic testing here
243243
sys.stdout.write("Default run command\n")
244-
sys.stdout.write("Verbose level: %s\n" % opts.verbose_level)
245-
sys.stdout.write("Debug: %s\n" % opts.debug)
246-
sys.stdout.write("dump_stack_trace: %s\n" % dump_stack_trace)
244+
sys.stdout.write(f"Verbose level: {opts.verbose_level}\n")
245+
sys.stdout.write(f"Debug: {opts.debug}\n")
246+
sys.stdout.write(f"dump_stack_trace: {dump_stack_trace}\n")
247247

248248

249249
def setup():

‎examples/object_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def run(opts):
101101
o_list = obj_api.object_list(c_list[0]['name'])
102102
print("\nObject")
103103
for o in o_list:
104-
print("%s" % o)
104+
print(f"{o}")
105105

106106

107107
if __name__ == "__main__":

‎examples/osc-lib.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ def run(opts):
9494
o_list = client_manager.object_store.object_list(c_list[0]['name'])
9595
print("\nObject")
9696
for o in o_list:
97-
print("%s" % o)
97+
print(f"{o}")
9898

9999
# Look at the compute flavors
100100
flavor_list = client_manager.compute.flavors.list()
101101
print("\nFlavors:")
102102
for f in flavor_list:
103-
print("%s" % f)
103+
print(f"{f}")
104104

105105

106106
if __name__ == "__main__":

‎openstackclient/api/api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ def find(
307307
except ks_exceptions.NotFound:
308308
kwargs = {attr: value}
309309
try:
310-
ret = self.find_one("/%s/detail" % (path), **kwargs)
310+
ret = self.find_one(f"/{path}/detail", **kwargs)
311311
except ks_exceptions.NotFound:
312312
msg = _("%s not found") % value
313313
raise exceptions.NotFound(msg)

‎openstackclient/api/object_store_v1.py‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,7 @@ def object_create(
256256
# object's name in the container.
257257
object_name_str = name if name else object
258258

259-
full_url = "{}/{}".format(
260-
urllib.parse.quote(container),
261-
urllib.parse.quote(object_name_str),
262-
)
259+
full_url = f"{urllib.parse.quote(container)}/{urllib.parse.quote(object_name_str)}"
263260
with open(object, 'rb') as f:
264261
response = self.create(
265262
full_url,
@@ -293,8 +290,7 @@ def object_delete(
293290
return
294291

295292
self.delete(
296-
"%s/%s"
297-
% (urllib.parse.quote(container), urllib.parse.quote(object))
293+
f"{urllib.parse.quote(container)}/{urllib.parse.quote(object)}"
298294
)
299295

300296
def object_list(
@@ -395,8 +391,7 @@ def object_save(
395391

396392
response = self._request(
397393
'GET',
398-
"%s/%s"
399-
% (urllib.parse.quote(container), urllib.parse.quote(object)),
394+
f"{urllib.parse.quote(container)}/{urllib.parse.quote(object)}",
400395
stream=True,
401396
)
402397
if response.status_code == 200:
@@ -431,8 +426,7 @@ def object_set(
431426
headers = self._set_properties(properties, 'X-Object-Meta-%s')
432427
if headers:
433428
self.create(
434-
"%s/%s"
435-
% (urllib.parse.quote(container), urllib.parse.quote(object)),
429+
f"{urllib.parse.quote(container)}/{urllib.parse.quote(object)}",
436430
headers=headers,
437431
)
438432

@@ -455,8 +449,7 @@ def object_unset(
455449
headers = self._unset_properties(properties, 'X-Remove-Object-Meta-%s')
456450
if headers:
457451
self.create(
458-
"%s/%s"
459-
% (urllib.parse.quote(container), urllib.parse.quote(object)),
452+
f"{urllib.parse.quote(container)}/{urllib.parse.quote(object)}",
460453
headers=headers,
461454
)
462455

@@ -480,8 +473,7 @@ def object_show(
480473

481474
response = self._request(
482475
'HEAD',
483-
"%s/%s"
484-
% (urllib.parse.quote(container), urllib.parse.quote(object)),
476+
f"{urllib.parse.quote(container)}/{urllib.parse.quote(object)}",
485477
)
486478

487479
data = {

‎openstackclient/common/quota.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,8 @@ def get_parser(self, prog_name):
507507
)
508508
for k, v, h in self._build_options_list():
509509
parser.add_argument(
510-
'--%s' % v,
511-
metavar='<%s>' % v,
510+
f'--{v}',
511+
metavar=f'<{v}>',
512512
dest=k,
513513
type=int,
514514
help=h,
@@ -590,7 +590,7 @@ def take_action(self, parsed_args):
590590
parsed_args.volume_type
591591
and k in IMPACT_VOLUME_TYPE_QUOTAS
592592
):
593-
k = k + '_%s' % parsed_args.volume_type
593+
k = k + f'_{parsed_args.volume_type}'
594594
volume_kwargs[k] = value
595595

596596
if self.app.client_manager.is_network_endpoint_enabled():

‎openstackclient/compute/v2/server.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ def get_parser(self, prog_name):
15041504
def take_action(self, parsed_args):
15051505
def _show_progress(progress):
15061506
if progress:
1507-
self.app.stdout.write('\rProgress: %s' % progress)
1507+
self.app.stdout.write(f'\rProgress: {progress}')
15081508
self.app.stdout.flush()
15091509

15101510
compute_client = self.app.client_manager.sdk_connection.compute
@@ -2189,7 +2189,7 @@ def get_parser(self, prog_name):
21892189
def take_action(self, parsed_args):
21902190
def _show_progress(progress):
21912191
if progress:
2192-
self.app.stdout.write('\rProgress: %s' % progress)
2192+
self.app.stdout.write(f'\rProgress: {progress}')
21932193
self.app.stdout.flush()
21942194

21952195
compute_client = self.app.client_manager.sdk_connection.compute
@@ -3198,7 +3198,7 @@ def get_parser(self, prog_name):
31983198
def take_action(self, parsed_args):
31993199
def _show_progress(progress):
32003200
if progress:
3201-
self.app.stdout.write('\rProgress: %s' % progress)
3201+
self.app.stdout.write(f'\rProgress: {progress}')
32023202
self.app.stdout.flush()
32033203

32043204
compute_client = self.app.client_manager.sdk_connection.compute
@@ -3350,7 +3350,7 @@ def get_parser(self, prog_name):
33503350
def take_action(self, parsed_args):
33513351
def _show_progress(progress):
33523352
if progress:
3353-
self.app.stdout.write('\rProgress: %s' % progress)
3353+
self.app.stdout.write(f'\rProgress: {progress}')
33543354
self.app.stdout.flush()
33553355

33563356
compute_client = self.app.client_manager.sdk_connection.compute
@@ -3555,7 +3555,7 @@ def get_parser(self, prog_name):
35553555
def take_action(self, parsed_args):
35563556
def _show_progress(progress):
35573557
if progress:
3558-
self.app.stdout.write('\rProgress: %s' % progress)
3558+
self.app.stdout.write(f'\rProgress: {progress}')
35593559
self.app.stdout.flush()
35603560

35613561
compute_client = self.app.client_manager.sdk_connection.compute
@@ -3816,7 +3816,7 @@ def get_parser(self, prog_name):
38163816
def take_action(self, parsed_args):
38173817
def _show_progress(progress):
38183818
if progress:
3819-
self.app.stdout.write('\rProgress: %s' % progress)
3819+
self.app.stdout.write(f'\rProgress: {progress}')
38203820
self.app.stdout.flush()
38213821

38223822
compute_client = self.app.client_manager.sdk_connection.compute
@@ -4188,7 +4188,7 @@ def get_parser(self, prog_name):
41884188
def take_action(self, parsed_args):
41894189
def _show_progress(progress):
41904190
if progress:
4191-
self.app.stdout.write('\rProgress: %s' % progress)
4191+
self.app.stdout.write(f'\rProgress: {progress}')
41924192
self.app.stdout.flush()
41934193

41944194
compute_client = self.app.client_manager.sdk_connection.compute
@@ -4584,7 +4584,7 @@ def get_parser(self, prog_name):
45844584
def take_action(self, parsed_args):
45854585
def _show_progress(progress):
45864586
if progress:
4587-
self.app.stdout.write('\rProgress: %s' % progress)
4587+
self.app.stdout.write(f'\rProgress: {progress}')
45884588
self.app.stdout.flush()
45894589

45904590
compute_client = self.app.client_manager.sdk_connection.compute
@@ -5181,7 +5181,7 @@ def get_parser(self, prog_name):
51815181
def take_action(self, parsed_args):
51825182
def _show_progress(progress):
51835183
if progress:
5184-
self.app.stdout.write('\rProgress: %s' % progress)
5184+
self.app.stdout.write(f'\rProgress: {progress}')
51855185
self.app.stdout.flush()
51865186

51875187
compute_client = self.app.client_manager.sdk_connection.compute

‎openstackclient/compute/v2/server_backup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def get_parser(self, prog_name):
6868
def take_action(self, parsed_args):
6969
def _show_progress(progress):
7070
if progress:
71-
self.app.stderr.write('\rProgress: %s' % progress)
71+
self.app.stderr.write(f'\rProgress: {progress}')
7272
self.app.stderr.flush()
7373

7474
compute_client = self.app.client_manager.sdk_connection.compute

‎openstackclient/compute/v2/server_image.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def get_parser(self, prog_name):
6969
def take_action(self, parsed_args):
7070
def _show_progress(progress):
7171
if progress:
72-
self.app.stdout.write('\rProgress: %s' % progress)
72+
self.app.stdout.write(f'\rProgress: {progress}')
7373
self.app.stdout.flush()
7474

7575
compute_client = self.app.client_manager.sdk_connection.compute

0 commit comments

Comments
 (0)