mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-01 04:36:13 +01:00
Code

Merge pull request #1464 from dirkmueller/flynt

Browse Source 
Convert to using f-strings
This commit is contained in:
Daniel Mach 2024-01-08 15:18:25 +01:00 committed by GitHub
commit b5c8fa75ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 460 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/OscConfigParser.py
View File

@ -114,7 +114,7 @@ class SectionLine(Line):
raise configparser.Error('value and line are mutually exclusive')
if value is not None:
line = '%s%s%s' % (optname, sep, value)
line = f'{optname}{sep}{value}'
opt = self._find(optname)
if opt:
opt.format(line)
@ -253,10 +253,10 @@ class OscConfigParser(configparser.ConfigParser):
#cursect[optname] = "%s\n%s" % (cursect[optname], value)
#self.set(cursect, optname, "%s\n%s" % (self.get(cursect, optname), value))
if cursect == configparser.DEFAULTSECT:
self._defaults[optname] = "%s\n%s" % (self._defaults[optname], value)
self._defaults[optname] = f"{self._defaults[optname]}\n{value}"
else:
# use the raw value here (original version uses raw=False)
self._sections[cursect]._find(optname).value = '%s\n%s' % (self.get(cursect, optname, raw=True), value)
self._sections[cursect]._find(optname).value = f'{self.get(cursect, optname, raw=True)}\n{value}'
# a section header or option header?
else:
# is it a section header?
@ -342,7 +342,7 @@ class OscConfigParser(configparser.ConfigParser):
first = False
else:
ret.append('')
ret.append('[%s]' % line.name)
ret.append(f'[{line.name}]')
for sline in line._lines:
if sline.name == '__name__':
continue

2
osc/babysitter.py
View File

@ -158,7 +158,7 @@ def run(prg, argv=None):
print(e, file=sys.stderr)
return 2
except oscerr.ExtRuntimeError as e:
print(e.file + ':', e.msg, file=sys.stderr)
print(f"{e.file}:", e.msg, file=sys.stderr)
except oscerr.ServiceRuntimeError as e:
print(e.msg, file=sys.stderr)
except oscerr.WorkingCopyOutdated as e:

2
osc/checker.py
View File

@ -11,7 +11,7 @@ class KeyError(Exception):
self.key = key
def __str__(self):
return '' + self.key + ' :' + ' '.join(self.args)
return f"{self.key} :{' '.join(self.args)}"
class Checker:

4
osc/cmdln.py
View File

@ -241,7 +241,7 @@ class Cmdln:
self.options, self.args = self.argparser.parse_known_args(argv[1:])
unrecognized = [i for i in self.args if i.startswith("-")]
if unrecognized:
self.argparser.error(f"unrecognized arguments: " + " ".join(unrecognized))
self.argparser.error(f"unrecognized arguments: {' '.join(unrecognized)}")
self.post_argparse()
@ -257,7 +257,7 @@ class Cmdln:
if arg_names == ["subcmd", "opts"]:
# positional args specified manually via @cmdln.option
if self.args:
self.argparser.error(f"unrecognized arguments: " + " ".join(self.args))
self.argparser.error(f"unrecognized arguments: {' '.join(self.args)}")
cmd(self.options.command, self.options)
elif arg_names == ["subcmd", "opts", "args"]:
# positional args are the remaining (unrecognized) args

344
osc/commandline.py
View File

File diff suppressed because it is too large Load Diff

26
osc/conf.py
View File

@ -1383,10 +1383,10 @@ def _model_to_rst(cls, title=None, description=None, sections=None, output_file=
ini_key = extra.get("ini_key", name)
x = bold(ini_key) + " : " + get_type(name, field)
x = f"{bold(ini_key)} : {get_type(name, field)}"
default = get_default(name, field)
if default:
x += " = " + italic(default)
x += f" = {italic(default)}"
result.append(x)
result.append("")
desc = extra.get("ini_description", None) or field.description or ""
@ -1499,13 +1499,13 @@ def parse_apisrv_url(scheme, apisrv):
elif scheme is not None:
url = scheme + apisrv
else:
url = "https://" + apisrv
url = f"https://{apisrv}"
scheme, url, path = urlsplit(url)[0:3]
return scheme, url, path.rstrip('/')
def urljoin(scheme, apisrv, path=''):
return '://'.join([scheme, apisrv]) + path
return f"{scheme}://{apisrv}" + path
def is_known_apiurl(url):
@ -1541,7 +1541,7 @@ def get_apiurl_api_host_options(apiurl):
apiurl = sanitize_apiurl(apiurl)
if is_known_apiurl(apiurl):
return config['api_host_options'][apiurl]
raise oscerr.ConfigMissingApiurl('missing credentials for apiurl: \'%s\'' % apiurl,
raise oscerr.ConfigMissingApiurl(f'missing credentials for apiurl: \'{apiurl}\'',
'', apiurl)
@ -1602,14 +1602,14 @@ def write_config(fname, cp):
if e.errno != errno.EEXIST:
raise
with open(fname + '.new', 'w') as f:
with open(f"{fname}.new", 'w') as f:
cp.write(f, comments=True)
try:
os.rename(fname + '.new', fname)
os.rename(f"{fname}.new", fname)
os.chmod(fname, 0o600)
except:
if os.path.exists(fname + '.new'):
os.unlink(fname + '.new')
if os.path.exists(f"{fname}.new"):
os.unlink(f"{fname}.new")
raise
@ -1642,10 +1642,10 @@ def config_set_option(section, opt, val=None, delete=False, update=True, creds_m
section = sections.get(section.rstrip('/'), section)
if section not in cp.sections():
raise oscerr.ConfigError('unknown section \'%s\'' % section, config['conffile'])
raise oscerr.ConfigError(f'unknown section \'{section}\'', config['conffile'])
if section == 'general' and opt not in general_opts or \
section != 'general' and opt not in api_host_options:
raise oscerr.ConfigError('unknown config option \'%s\'' % opt, config['conffile'])
raise oscerr.ConfigError(f'unknown config option \'{opt}\'', config['conffile'])
if not val and not delete and opt == 'pass' and creds_mgr_descr is not None:
# change password store
@ -1758,7 +1758,7 @@ def _get_credentials_manager(url, cp):
if cp.has_option(url, credentials.AbstractCredentialsManager.config_entry):
creds_mgr = credentials.create_credentials_manager(url, cp)
if creds_mgr is None:
msg = 'Unable to instantiate creds mgr (section: %s)' % url
msg = f'Unable to instantiate creds mgr (section: {url})'
conffile = get_configParser.conffile
raise oscerr.ConfigMissingCredentialsError(msg, conffile, url)
return creds_mgr
@ -1977,7 +1977,7 @@ def identify_conf():
return '~/.oscrc'
if os.environ.get('XDG_CONFIG_HOME', '') != '':
conffile = os.environ.get('XDG_CONFIG_HOME') + '/osc/oscrc'
conffile = f"{os.environ.get('XDG_CONFIG_HOME')}/osc/oscrc"
else:
conffile = '~/.config/osc/oscrc'

6
osc/connection.py
View File

@ -488,7 +488,7 @@ class CookieJarAuthHandler(AuthHandlerBase):
# doing expensive signature auth in multiple processes.
# This usually happens when a user runs multiple osc instances
# from the command-line in parallel.
self.cookiejar_lock_path = self.cookiejar_path + ".lock"
self.cookiejar_lock_path = f"{self.cookiejar_path}.lock"
self.cookiejar_lock_fd = None
@property
@ -633,7 +633,7 @@ class SignatureAuthHandler(AuthHandlerBase):
keyfile = self.guess_keyfile()
else:
if '/' not in keyfile:
keyfile = '~/.ssh/' + keyfile
keyfile = f"~/.ssh/{keyfile}"
keyfile = os.path.expanduser(keyfile)
cmd = [self.ssh_keygen_path, '-Y', 'sign', '-f', keyfile, '-n', namespace, '-q']
@ -668,7 +668,7 @@ class SignatureAuthHandler(AuthHandlerBase):
auth = self.get_authorization(chal)
if not auth:
return False
auth_val = 'Signature %s' % auth
auth_val = f'Signature {auth}'
req.add('Authorization', auth_val)
return True

499
osc/core.py
View File

File diff suppressed because it is too large Load Diff

4
osc/credentials.py
View File

@ -211,7 +211,7 @@ class KeyringCredentialsManager(AbstractCredentialsManager):
def set_password(self, url, user, password):
self._load_backend()
keyring.set_password(urlsplit(url)[1], user, password)
config_value = self._qualified_name() + ':' + self._backend_cls_name
config_value = f"{self._qualified_name()}:{self._backend_cls_name}"
self._cp.set(url, self.config_entry, config_value)
def delete_password(self, url, user):
@ -317,7 +317,7 @@ def create_credentials_manager(url, cp):
def qualified_name(obj):
return obj.__module__ + '.' + obj.__class__.__name__
return f"{obj.__module__}.{obj.__class__.__name__}"
def has_keyring_support():

20
osc/fetch.py
View File

@ -45,23 +45,23 @@ class Fetcher:
self.gr = OscFileGrabber(progress_obj=self.progress_obj)
def __add_cpio(self, pac):
prpap = '%s/%s/%s/%s' % (pac.project, pac.repository, pac.repoarch, pac.repopackage)
prpap = f'{pac.project}/{pac.repository}/{pac.repoarch}/{pac.repopackage}'
self.cpio.setdefault(prpap, {})[pac.repofilename] = pac
def __download_cpio_archive(self, apiurl, project, repo, arch, package, **pkgs):
if not pkgs:
return
query = ['binary=%s' % quote_plus(i) for i in pkgs]
query = [f'binary={quote_plus(i)}' for i in pkgs]
query.append('view=cpio')
for module in self.modules:
query.append('module=' + module)
query.append(f"module={module}")
try:
url = makeurl(apiurl, ['build', project, repo, arch, package], query=query)
sys.stdout.write("preparing download ...\r")
sys.stdout.flush()
with tempfile.NamedTemporaryFile(prefix='osc_build_cpio') as tmparchive:
self.gr.urlgrab(url, filename=tmparchive.name,
text='fetching packages for \'%s\'' % project)
text=f'fetching packages for \'{project}\'')
archive = cpio.CpioRead(tmparchive.name)
archive.read()
for hdr in archive:
@ -133,7 +133,7 @@ class Fetcher:
mg = OscMirrorGroup(self.gr, pac.urllist)
if self.http_debug:
print('\nURLs to try for package \'%s\':' % pac, file=sys.stderr)
print(f'\nURLs to try for package \'{pac}\':', file=sys.stderr)
print('\n'.join(pac.urllist), file=sys.stderr)
print(file=sys.stderr)
@ -141,7 +141,7 @@ class Fetcher:
with tempfile.NamedTemporaryFile(prefix='osc_build',
delete=False) as tmpfile:
mg_stat = mg.urlgrab(pac.filename, filename=tmpfile.name,
text='%s(%s) %s' % (prefix, pac.project, pac.filename))
text=f'{prefix}({pac.project}) {pac.filename}')
if mg_stat:
self.move_package(tmpfile.name, pac.localdir, pac)
@ -198,7 +198,7 @@ class Fetcher:
if self.download_api_only:
return []
urllist = self.urllist
key = '%s/%s' % (pac.project, pac.repository)
key = f'{pac.project}/{pac.repository}'
project_repo_url = buildinfo.urls.get(key)
if project_repo_url is not None:
urllist = [project_repo_url]
@ -290,7 +290,7 @@ class Fetcher:
prjs = list(buildinfo.projects.keys())
for i in prjs:
dest = "%s/%s" % (self.cachedir, i)
dest = f"{self.cachedir}/{i}"
if not os.path.exists(dest):
os.makedirs(dest, mode=0o755)
dest += '/_pubkey'
@ -322,8 +322,8 @@ class Fetcher:
if try_parent:
if self.http_debug:
print("can't fetch key for %s" % (i), file=sys.stderr)
print("url: %s" % url, file=sys.stderr)
print(f"can't fetch key for {i}", file=sys.stderr)
print(f"url: {url}", file=sys.stderr)
if os.path.exists(dest):
os.unlink(dest)

4
osc/meter.py
View File

@ -17,10 +17,10 @@ class PBTextMeter:
def start(self, basename, size=None):
if size is None:
widgets = [basename + ': ', pb.AnimatedMarker(), ' ', pb.Timer()]
widgets = [f"{basename}: ", pb.AnimatedMarker(), ' ', pb.Timer()]
self.bar = pb.ProgressBar(widgets=widgets, maxval=pb.UnknownLength)
else:
widgets = [basename + ': ', pb.Bar(), ' ', pb.ETA()]
widgets = [f"{basename}: ", pb.Bar(), ' ', pb.ETA()]
if size:
# if size is 0, using pb.Percentage will result in
# a ZeroDivisionException

4
osc/oscerr.py
View File

@ -189,7 +189,7 @@ class OscInvalidRevision(OscValueError):
"""
def __str__(self):
return "Invalid revision value: {}".format("".join(self.args))
return f"Invalid revision value: {''.join(self.args)}"
class PackageNotInstalled(OscBaseError):
@ -201,7 +201,7 @@ class PackageNotInstalled(OscBaseError):
super().__init__((pkg,))
def __str__(self):
return 'Package %s is required for this operation' % self.args
return f'Package {self.args} is required for this operation'
class SignalInterrupt(Exception):

2
osc/store.py
View File

@ -137,7 +137,7 @@ class Store:
if not isinstance(value, str):
msg = f"The argument `value` should be str, not {type(value).__name__}"
raise TypeError(msg)
self.write_file(fn, value + "\n", subdir=subdir)
self.write_file(fn, f"{value}\n", subdir=subdir)
def read_int(self, fn):
if not self.exists(fn):