mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-14 08:16:15 +01:00
Code

Prefer f-strings ove c-style string expansion

Browse Source 
This exists since Python >= 3.6 and is shorter and easier to read.
This commit is contained in:
Dirk Mueller 2023-03-30 10:25:49 +02:00
parent 370b0d225d
commit 483685aaa8
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/babysitter.py
View File

@ -80,7 +80,7 @@ def run(prg, argv=None):
except oscerr.APIError as e: except oscerr.APIError as e:
print('BuildService API error:', e.msg, file=sys.stderr) print('BuildService API error:', e.msg, file=sys.stderr)
except oscerr.LinkExpandError as e: except oscerr.LinkExpandError as e:
print('Link "%s/%s" cannot be expanded:\n' % (e.prj, e.pac), e.msg, file=sys.stderr) print(f'Link "{e.prj}/{e.pac}" cannot be expanded:\n', e.msg, file=sys.stderr)
print('Use "osc repairlink" to fix merge conflicts.\n', file=sys.stderr) print('Use "osc repairlink" to fix merge conflicts.\n', file=sys.stderr)
except oscerr.WorkingCopyWrongVersion as e: except oscerr.WorkingCopyWrongVersion as e:
print(e, file=sys.stderr) print(e, file=sys.stderr)
@ -116,11 +116,11 @@ def run(prg, argv=None):
msg = _private.api.xml_escape(msg) msg = _private.api.xml_escape(msg)
print(decode_it(msg), file=sys.stderr) print(decode_it(msg), file=sys.stderr)
if e.code >= 500 and e.code <= 599: if e.code >= 500 and e.code <= 599:
print('\nRequest: %s' % e.filename) print(f'\nRequest: {e.filename}')
print('Headers:') print('Headers:')
for h, v in e.hdrs.items(): for h, v in e.hdrs.items():
if h != 'Set-Cookie': if h != 'Set-Cookie':
print("%s: %s" % (h, v)) print(f"{h}: {v}")
except BadStatusLine as e: except BadStatusLine as e:
print('Server returned an invalid response:', e, file=sys.stderr) print('Server returned an invalid response:', e, file=sys.stderr)
@ -130,7 +130,7 @@ def run(prg, argv=None):
except URLError as e: except URLError as e:
msg = 'Failed to reach a server' msg = 'Failed to reach a server'
if hasattr(e, '_osc_host_port'): if hasattr(e, '_osc_host_port'):
msg += ' (%s)' % e._osc_host_port msg += f' ({e._osc_host_port})'
msg += ':\n' msg += ':\n'
print(msg, e.reason, file=sys.stderr) print(msg, e.reason, file=sys.stderr)
except ssl.SSLError as e: except ssl.SSLError as e:
@ -174,7 +174,7 @@ def run(prg, argv=None):
except oscerr.PackageError as e: except oscerr.PackageError as e:
print(e.msg, file=sys.stderr) print(e.msg, file=sys.stderr)
except PackageError as e: except PackageError as e:
print('%s:' % e.fname, e.msg, file=sys.stderr) print(f'{e.fname}:', e.msg, file=sys.stderr)
except RPMError as e: except RPMError as e:
print(e, file=sys.stderr) print(e, file=sys.stderr)
except CertVerificationError as e: except CertVerificationError as e: