summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Waldmann <tw@waldmann-edv.de>2023-07-26 00:28:35 +0200
committerThomas Waldmann <tw@waldmann-edv.de>2023-07-26 01:24:00 +0200
commit6151b369c4ca96cf2ac5c7aebb4818d28b2200ad (patch)
treef2e46c123892e931c213cdefe5251512cc74514c /src
parent35ac39b7514f0fe2e4bf93b578f6afbbf838c9cd (diff)
fix E741
Diffstat (limited to 'src')
-rw-r--r--src/borg/archiver/__init__.py4
-rw-r--r--src/borg/helpers/parseformat.py4
-rw-r--r--src/borg/testsuite/crypto.py20
3 files changed, 14 insertions, 14 deletions
diff --git a/src/borg/archiver/__init__.py b/src/borg/archiver/__init__.py
index f9cad6179..e62783555 100644
--- a/src/borg/archiver/__init__.py
+++ b/src/borg/archiver/__init__.py
@@ -570,8 +570,8 @@ def format_tb(exc):
remote = isinstance(exc, RemoteRepository.RPCError)
if remote:
prefix = "Borg server: "
- trace_back = "\n".join(prefix + l for l in exc.exception_full.splitlines())
- sys_info = "\n".join(prefix + l for l in exc.sysinfo.splitlines())
+ trace_back = "\n".join(prefix + line for line in exc.exception_full.splitlines())
+ sys_info = "\n".join(prefix + line for line in exc.sysinfo.splitlines())
else:
trace_back = traceback.format_exc()
sys_info = sysinfo()
diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py
index ce43e99f5..79928a610 100644
--- a/src/borg/helpers/parseformat.py
+++ b/src/borg/helpers/parseformat.py
@@ -373,8 +373,8 @@ def format_archive(archive):
def parse_stringified_list(s):
- l = re.split(" *, *", s)
- return [item for item in l if item != ""]
+ items = re.split(" *, *", s)
+ return [item for item in items if item != ""]
class Location:
diff --git a/src/borg/testsuite/crypto.py b/src/borg/testsuite/crypto.py
index 6ab7be026..88386946c 100644
--- a/src/borg/testsuite/crypto.py
+++ b/src/borg/testsuite/crypto.py
@@ -202,9 +202,9 @@ class CryptoTestCase(BaseTestCase):
ikm = b"\x0b" * 22
salt = bytes.fromhex("000102030405060708090a0b0c")
info = bytes.fromhex("f0f1f2f3f4f5f6f7f8f9")
- l = 42
+ length = 42
- okm = hkdf_hmac_sha512(ikm, salt, info, l)
+ okm = hkdf_hmac_sha512(ikm, salt, info, length)
assert okm == bytes.fromhex(
"832390086cda71fb47625bb5ceb168e4c8e26a1a16ed34d9fc7fe92c1481579338da362cb8d9f925d7cb"
)
@@ -222,9 +222,9 @@ class CryptoTestCase(BaseTestCase):
"b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7"
"d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"
)
- l = 82
+ length = 82
- okm = hkdf_hmac_sha512(ikm, salt, info, l)
+ okm = hkdf_hmac_sha512(ikm, salt, info, length)
assert okm == bytes.fromhex(
"ce6c97192805b346e6161e821ed165673b84f400a2b514b2fe23d84cd189ddf1b695b48cbd1c838844"
"1137b3ce28f16aa64ba33ba466b24df6cfcb021ecff235f6a2056ce3af1de44d572097a8505d9e7a93"
@@ -234,9 +234,9 @@ class CryptoTestCase(BaseTestCase):
ikm = bytes.fromhex("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")
salt = None
info = b""
- l = 42
+ length = 42
- okm = hkdf_hmac_sha512(ikm, salt, info, l)
+ okm = hkdf_hmac_sha512(ikm, salt, info, length)
assert okm == bytes.fromhex(
"f5fa02b18298a72a8c23898a8703472c6eb179dc204c03425c970e3b164bf90fff22d04836d0e2343bac"
)
@@ -245,9 +245,9 @@ class CryptoTestCase(BaseTestCase):
ikm = bytes.fromhex("0b0b0b0b0b0b0b0b0b0b0b")
salt = bytes.fromhex("000102030405060708090a0b0c")
info = bytes.fromhex("f0f1f2f3f4f5f6f7f8f9")
- l = 42
+ length = 42
- okm = hkdf_hmac_sha512(ikm, salt, info, l)
+ okm = hkdf_hmac_sha512(ikm, salt, info, length)
assert okm == bytes.fromhex(
"7413e8997e020610fbf6823f2ce14bff01875db1ca55f68cfcf3954dc8aff53559bd5e3028b080f7c068"
)
@@ -256,9 +256,9 @@ class CryptoTestCase(BaseTestCase):
ikm = bytes.fromhex("0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c")
salt = None
info = b""
- l = 42
+ length = 42
- okm = hkdf_hmac_sha512(ikm, salt, info, l)
+ okm = hkdf_hmac_sha512(ikm, salt, info, length)
assert okm == bytes.fromhex(
"1407d46013d98bc6decefcfee55f0f90b0c7f63d68eb1a80eaf07e953cfc0a3a5240a155d6e4daa965bb"
)