GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

f-strings

Browse Source
This commit is contained in:
Devaev Maxim
2019-06-28 18:59:36 +03:00
parent ff270591b0
commit ef3c62a7af
15 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kvmd/apps/ipmi/auth.py
View File

@@ -61,12 +61,12 @@ class IpmiAuthManager:
continue
if " -> " not in line:
raise IpmiPasswdError("Missing ' -> ' operator at line #%d" % (number))
raise IpmiPasswdError(f"Missing ' -> ' operator at line #{number}")
(left, right) = map(str.lstrip, line.split(" -> ", 1))
for (name, pair) in [("left", left), ("right", right)]:
if ":" not in pair:
raise IpmiPasswdError("Missing ':' operator in %s credentials at line #%d" % (name, number))
raise IpmiPasswdError(f"Missing ':' operator in {name} credentials at line #{number}")
(ipmi_user, ipmi_passwd) = left.split(":")
ipmi_user = ipmi_user.strip()
@@ -75,7 +75,7 @@ class IpmiAuthManager:
kvmd_user = kvmd_user.strip()
if ipmi_user in credentials:
raise IpmiPasswdError("Found duplicating user %r (left) at line #%d" % (ipmi_user, number))
raise IpmiPasswdError(f"Found duplicating user {ipmi_user!r} (left) at line #{number}")
credentials[ipmi_user] = IpmiUserCredentials(
ipmi_user=ipmi_user,

4
kvmd/apps/ipmi/server.py
View File

@@ -155,7 +155,7 @@ class IpmiServer(BaseIpmiServer): # pylint: disable=too-many-instance-attribute
logger = get_logger(0)
assert handle.startswith("/")
url = "http://%s:%d%s" % (self.__kvmd_host, self.__kvmd_port, handle)
url = f"http://{self.__kvmd_host}:{self.__kvmd_port}{handle}"
credentials = self.__auth_manager.get_credentials(ipmi_session.username.decode())
logger.info("Performing %r request to %r from user %r (IPMI) as %r (KVMD)",
@@ -169,7 +169,7 @@ class IpmiServer(BaseIpmiServer): # pylint: disable=too-many-instance-attribute
headers={
"X-KVMD-User": credentials.kvmd_user,
"X-KVMD-Passwd": credentials.kvmd_passwd,
"User-Agent": "KVMD-IPMI/%s" % (__version__),
"User-Agent": f"KVMD-IPMI/{__version__}",
},
timeout=self.__kvmd_timeout,
) as response: