shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-07-10 00:59:41 +03:00
Code Issues Projects Releases Activity

setup: styling: Adopt f-strings in favour of old-style string formatting

Browse Source 
Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety
2023-06-07 17:10:52 +02:00
parent e418191c7b
commit 745e5a8ca4
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
setup.py
View File

@ -59,7 +59,9 @@ def have_libvirt_lxc():
def get_pkgconfig_data(args, mod, required=True): def get_pkgconfig_data(args, mod, required=True):
"""Run pkg-config to and return content associated with it""" """Run pkg-config to and return content associated with it"""
f = os.popen("%s %s %s" % ("pkg-config", " ".join(args), mod))
args_str = " ".join(args)
f = os.popen(f"pkg-config {args_str} {mod}")
line = f.readline() line = f.readline()
if line is not None: if line is not None:
@ -67,7 +69,7 @@ def get_pkgconfig_data(args, mod, required=True):
if line is None or line == "": if line is None or line == "":
if required: if required:
raise Exception("Cannot determine '%s' from libvirt pkg-config file" % " ".join(args)) raise Exception(f"Cannot determine '{args_str}' from libvirt pkg-config file")
else: else:
return "" return ""
@ -261,11 +263,7 @@ class my_test(Command):
def find_build_dir(self): def find_build_dir(self):
if self.plat_name is not None: if self.plat_name is not None:
plat_specifier = ".%s-%d.%d" % (self.plat_name, plat_specifier = f".{self.plat_name}-{sys.version_info[0]}.{sys.version_info[1]}"
sys.version_info[0],
sys.version_info[1])
if hasattr(sys, "gettotalrefcount"):
plat_specifier += "-pydebug"
return os.path.join(self.build_base, return os.path.join(self.build_base,
'lib' + plat_specifier) 'lib' + plat_specifier)
@ -291,10 +289,9 @@ class my_test(Command):
def find_pytest_path(self): def find_pytest_path(self):
binaries = [ binaries = [
"pytest-%d.%d" % (sys.version_info[0], f"pytest-{sys.version_info[0]}.{sys.version_info[1]}",
sys.version_info[1]), f"pytest-{sys.version_info[0]}",
"pytest-%d" % (sys.version_info[0]), f"pytest{sys.version_info[0]}",
"pytest%d" % (sys.version_info[0]),
"pytest", "pytest",
] ]