What changed, and why it matters
This commit is purely a code-style cleanup. It turns on two new lint checks in the project's Python linter (ruff) and renames single-letter variables like 'l' to clearer names like 'length', 'line', 'left', etc. No program behavior is changed, and there are no security fixes.
No security action needed. Treat as a normal style/linting commit.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit enables ruff E7 and E9 lint rules in pyproject.toml. E7 catches ambiguous or error-prone syntax/statements (e.g., ‘x == None’, bare except, single-letter names like l/I/O), and E9 catches runtime errors such as unreadable files. The diff only renames variables, rewrites one ‘not … in …’ to ‘… not in …’, and adds ‘# noqa: E741’ comments for legitimate mathematical constants. No logic, parsing, cryptography, or control flow is altered.
Changed components
pyproject.toml lint configurationcore/src/apps/common/cbor.pycore/src/apps/extapp/load.pycore/src/trezor/crypto/slip39.pycore/tests/test_trezor.crypto.curve.ed25519.pycore/tests/test_trezor.crypto.random.pycore/tests/test_trezor.io.fatfs.pycore/tools/alloc.pylegacy/firmware/bl_data.pypython/src/trezorlib/_ed25519.pypython/src/trezorlib/_internal/firmware_headers.pypython/src/trezorlib/btc.pypython/src/trezorlib/debuglink.pytests/click_tests/record_layout.pytests/device_tests/ethereum/test_signtx.pytests/device_tests/misc/test_msg_getentropy.pytests/ui_tests/reporting/html.pytools/github_issues_to_csv.pyInspect captured patch +82 / −69
### core/src/apps/common/cbor.py
@@ -51,19 +51,19 @@
_CBOR_SET_TAG = const(0x102) # Tag 258
-def _header(typ: int, l: int) -> bytes:
+def _header(typ: int, length: int) -> bytes:
from struct import pack
- if l < 24:
- return pack(">B", typ + l)
- elif l < 2**8:
- return pack(">BB", typ + 24, l)
- elif l < 2**16:
- return pack(">BH", typ + 25, l)
- elif l < 2**32:
- return pack(">BI", typ + 26, l)
- elif l < 2**64:
- return pack(">BQ", typ + 27, l)
+ if length < 24:
+ return pack(">B", typ + length)
+ elif length < 2**8:
+ return pack(">BB", typ + 24, length)
+ elif length < 2**16:
+ return pack(">BH", typ + 25, length)
+ elif length < 2**32:
+ return pack(">BI", typ + 26, length)
+ elif length < 2**64:
+ return pack(">BQ", typ + 27, length)
else:
raise NotImplementedError # Length not supported
### core/src/apps/extapp/load.py
@@ -1,7 +1,7 @@
from typing import TYPE_CHECKING
import storage.device as storage_device
-import ustruct # pyright: ignore[reportMissingImports]
+import ustruct # type: ignore [Import "ustruct" could not be resolved]
from storage import cache_common as cc
from trezor import log
from trezor.crypto import random
### core/src/trezor/crypto/slip39.py
@@ -166,17 +166,17 @@ def decrypt(
here, because passphrase function is symmetric in SLIP-39. We are using the terms
"encrypt" and "decrypt" instead.
"""
- l = encrypted_master_secret[: len(encrypted_master_secret) // 2]
- r = encrypted_master_secret[len(encrypted_master_secret) // 2 :]
+ left = encrypted_master_secret[: len(encrypted_master_secret) // 2]
+ right = encrypted_master_secret[len(encrypted_master_secret) // 2 :]
salt = _get_salt(identifier, extendable)
for i in reversed(range(_ROUND_COUNT)):
- l, r = (
- r,
- _xor(l, _round_function(i, passphrase, iteration_exponent, salt, r)),
+ left, right = (
+ right,
+ _xor(left, _round_function(i, passphrase, iteration_exponent, salt, right)),
)
if progress_callback:
progress_callback(_ROUND_COUNT - i, _ROUND_COUNT)
- return r + l
+ return right + left
def generate_random_identifier() -> int:
### core/tests/test_trezor.crypto.curve.ed25519.py
@@ -70,10 +70,10 @@ def test_verify(self):
pass
def test_sign_verify_random(self):
- for l in range(1, 300):
+ for length in range(1, 300):
sk = ed25519.generate_secret()
pk = ed25519.publickey(sk)
- msg = random.bytes(l)
+ msg = random.bytes(length)
sig = ed25519.sign(sk, msg)
self.assertTrue(ed25519.verify(pk, sig, msg))
### core/tests/test_trezor.crypto.random.py
@@ -16,9 +16,9 @@ def test_uniform(self):
self.assertAlmostEqual(c[r], 1000, delta=200)
def test_bytes_length(self):
- for l in range(1024 + 1):
- lst = random.bytes(l)
- self.assertEqual(len(lst), l)
+ for length in range(1024 + 1):
+ lst = random.bytes(length)
+ self.assertEqual(len(lst), length)
def test_bytes_big_length(self):
with self.assertRaises(ValueError):
@@ -37,11 +37,11 @@ def test_bytes_uniform(self):
self.assertAlmostEqual(c[h], 1000, delta=200)
def test_shuffle(self):
- for l in range(256 + 1):
- lst = list(range(l))
+ for length in range(256 + 1):
+ lst = list(range(length))
random.shuffle(lst)
- self.assertEqual(len(lst), l)
- self.assertEqual(sorted(lst), list(range(l)))
+ self.assertEqual(len(lst), length)
+ self.assertEqual(sorted(lst), list(range(length)))
if __name__ == "__main__":
### core/tests/test_trezor.io.fatfs.py
@@ -37,12 +37,12 @@ def test_listdir(self):
f.write(bytearray(b"test"))
with fatfs.open(f"/{self._dirname()}/{self._filename('2')}", "w") as f:
f.write(bytearray(b"testtest"))
- l = [e for e in fatfs.listdir("/")]
+ entries = [e for e in fatfs.listdir("/")]
self.assertEqual(
- l, [(0, "---d-", self._dirname()), (4, "----a", self._filename())]
+ entries, [(0, "---d-", self._dirname()), (4, "----a", self._filename())]
)
- l = [e for e in fatfs.listdir(f"/{self._dirname()}")]
- self.assertEqual(l, [(8, "----a", self._filename("2"))])
+ entries = [e for e in fatfs.listdir(f"/{self._dirname()}")]
+ self.assertEqual(entries, [(8, "----a", self._filename("2"))])
def test_unlink(self):
fatfs.mkdir(f"/{self._dirname()}")
### core/tools/alloc.py
@@ -86,7 +86,7 @@ def alloc_str(line: LineAllocData) -> str:
filedata = obj.data[filename]
linedata = {lineno: alloc_str(line) for lineno, line in filedata.items()}
- maxlen = max(len(l) for l in linedata.values())
+ maxlen = max(len(s) for s in linedata.values())
lineno = 0
for line in open("src/" + filename):
@@ -119,21 +119,21 @@ def list_function(obj: SharedObject, reverse: bool) -> None:
if obj.type == "total":
field = "total_allocs"
- def format_num(l: tuple[str, float, int]) -> str:
- return f"{l[2]}"
+ def format_num(item: tuple[str, float, int]) -> str:
+ return f"{item[2]}"
else:
field = "avg_allocs"
- def format_num(l: tuple[str, float, int]) -> str:
- return f"{l[1]:.2f}"
+ def format_num(item: tuple[str, float, int]) -> str:
+ return f"{item[1]:.2f}"
file_sums = _list(obj, field, reverse)
- maxlen = max(len(format_num(l)) for l in file_sums)
- for l in file_sums:
- num_str = format_num(l)
- filename = l[0]
+ maxlen = max(len(format_num(item)) for item in file_sums)
+ for item in file_sums:
+ num_str = format_num(item)
+ filename = item[0]
print(f"{num_str:>{maxlen}} {filename}")
### legacy/firmware/bl_data.py
@@ -26,13 +26,13 @@
# is our bootloader
with open("bl_check.c", "rt") as f:
hashes = []
- for l in f.readlines():
- if not len(l) >= 78 or not l.startswith(' "\\x'):
+ for line in f.readlines():
+ if not len(line) >= 78 or not line.startswith(' "\\x'):
continue
- l = l[14:78]
+ line = line[14:78]
h = ""
- for i in range(0, len(l), 4):
- h += l[i + 2 : i + 4]
+ for i in range(0, len(line), 4):
+ h += line[i + 2 : i + 4]
hashes.append(h)
check = hashes[-2] + hashes[-1]
if check != bh.hex():
### pyproject.toml
@@ -112,6 +112,10 @@ select = [
# PEP 604 (in /python only where `from __future__ import annotations` is present, see target-version)
"UP007", # non-pep604-annotation-union: Union[int, str] -> int | str
"UP045", # non-pep604-annotation-optional: Optional[str] -> str | None
+
+ # pycodestyle
+ "E7", # statements: x == None, not x in y, bare except, lambda assignment, ambiguous names (l, I, O), ...
+ "E9", # runtime errors: unreadable file (io-error)
]
[tool.ruff.lint.isort]
### python/src/trezorlib/_ed25519.py
@@ -42,7 +42,7 @@
b = 256
q: int = 2**255 - 19
-l: int = 2**252 + 27742317777372353535851937790883648493
+l: int = 2**252 + 27742317777372353535851937790883648493 # noqa: E741
COORD_MASK = ~(1 + 2 + 4 + (1 << b - 1))
COORD_HIGH_BIT = 1 << b - 2
@@ -78,7 +78,7 @@ def inv(z: int) -> int:
d = -121665 * inv(121666) % q
-I = pow(2, (q - 1) // 4, q)
+I = pow(2, (q - 1) // 4, q) # noqa: E741
def xrecover(y: int) -> int:
### python/src/trezorlib/_internal/firmware_headers.py
@@ -646,7 +646,7 @@ def public_keys(
(2, False): fw_models.LEGACY_V1V2,
(2, True): fw_models.LEGACY_V1V2_DEV,
}
- if not (signature_version, dev_keys) in keymap:
+ if (signature_version, dev_keys) not in keymap:
raise ValueError("Unsupported signature version")
return keymap[signature_version, dev_keys].firmware_keys
### python/src/trezorlib/btc.py
@@ -397,8 +397,9 @@ def copy_tx_meta(tx: messages.TransactionType) -> messages.TransactionType:
assert res.details.extra_data_offset is not None
assert res.details.extra_data_len is not None
assert current_tx.extra_data is not None
- o, l = res.details.extra_data_offset, res.details.extra_data_len
- msg.extra_data = current_tx.extra_data[o : o + l]
+ offset = res.details.extra_data_offset
+ length = res.details.extra_data_len
+ msg.extra_data = current_tx.extra_data[offset : offset + length]
else:
raise exceptions.TrezorException(
f"Unknown request type - {res.request_type}."
### python/src/trezorlib/debuglink.py
@@ -2291,9 +2291,11 @@ def type_word(self, word: str, is_slip39: bool = False) -> t.Iterator[Coords]:
yield from self._type_word_bip39(word)
def _type_word_slip39(self, word: str) -> t.Iterator[Coords]:
- for l in word:
+ for letter in word:
idx = next(
- i for i, letters in enumerate(BUTTON_LETTERS_SLIP39) if l in letters
+ i
+ for i, letters in enumerate(BUTTON_LETTERS_SLIP39)
+ if letter in letters
)
yield self.debuglink.screen_buttons.mnemonic_from_index(idx)
### tests/click_tests/record_layout.py
@@ -271,10 +271,10 @@ def call_to_strs(call):
# finish layouts iterator -- should not do anything ideally
layout_text.extend(layouts_iter)
- layout_text = [layout_to_output(l) for l in layout_text]
+ layout_text = [layout_to_output(layout) for layout in layout_text]
all_lines = "\n".join([call] + layout_text + result_list).split("\n")
- all_lines = [f" {l}" for l in all_lines]
+ all_lines = [f" {line}" for line in all_lines]
func_name_under = func_name.replace(".", "_")
all_lines.insert(0, f"def test_{func_name_under}(device_handler):")
all_lines.insert(1, " debug = device_handler.debuglink()")
### tests/device_tests/ethereum/test_signtx.py
@@ -352,9 +352,9 @@ def br_sign_tx(n):
br_protect = messages.ButtonRequest(code=messages.ButtonRequestType.ProtectCall)
- def tx_request(l):
+ def tx_request(length):
return message_filters.EthereumTxRequest(
- data_length=l, signature_r=None, signature_s=None, signature_v=None
+ data_length=length, signature_r=None, signature_s=None, signature_v=None
)
if is_legacy:
@@ -365,11 +365,15 @@ def tx_request(l):
br_protect,
br_sign_tx(None),
]
- expected_responses += [tx_request(l) for l in (1024, 1024, 1024, 3)]
+ expected_responses += [
+ tx_request(length) for length in (1024, 1024, 1024, 3)
+ ]
expected_responses += [message_filters.EthereumTxRequest(data_length=None)]
else:
expected_responses: list[ExpectedResponse] = []
- expected_responses += [tx_request(l) for l in (1024, 1024, 1024, 3)]
+ expected_responses += [
+ tx_request(length) for length in (1024, 1024, 1024, 3)
+ ]
expected_responses += [br_sign_tx("confirm_data")]
if client.model is models.T3T1 or client.model is models.T3W1:
# related issue: https://github.com/trezor/trezor-firmware/issues/6490
### tests/device_tests/misc/test_msg_getentropy.py
@@ -22,8 +22,10 @@
from trezorlib import misc
from trezorlib.debuglink import DebugSession as Session
-ENTROPY_LENGTHS_POW2 = [pytest.param(2**l, id=f"2^{l}") for l in range(10)]
-ENTROPY_LENGTHS_POW2_1 = [pytest.param(2**l + 1, id=f"2^{l}+1") for l in range(10)]
+ENTROPY_LENGTHS_POW2 = [pytest.param(2**exp, id=f"2^{exp}") for exp in range(10)]
+ENTROPY_LENGTHS_POW2_1 = [
+ pytest.param(2**exp + 1, id=f"2^{exp}+1") for exp in range(10)
+]
ENTROPY_LENGTHS = ENTROPY_LENGTHS_POW2 + ENTROPY_LENGTHS_POW2_1
### tests/ui_tests/reporting/html.py
@@ -139,7 +139,7 @@ def collapsible_rows(rows, cur_dir):
def diff_table(diff: Iterable[tuple[str | None, str | None]], cur_dir: Path) -> None:
rows = list(diff)
- has_diff = any(l != r for l, r in rows)
+ has_diff = any(left != right for left, right in rows)
if (
not has_diff or len(rows) <= _COLLAPSE_UNCHANGED_THRESHOLD
### tools/github_issues_to_csv.py
@@ -38,17 +38,17 @@ def write_issues(r: requests.Response, csvout: Any) -> None:
severity = ""
weight = ""
labels = []
- for l in issue["labels"]:
- if l["name"][:2] in PRIORITIES:
- priority = l["name"]
- elif l["name"][:2] in SEVERITIES:
- severity = l["name"]
- elif l["name"] in WEIGHTS:
- weight = l["name"][1:]
+ for label in issue["labels"]:
+ if label["name"][:2] in PRIORITIES:
+ priority = label["name"]
+ elif label["name"][:2] in SEVERITIES:
+ severity = label["name"]
+ elif label["name"] in WEIGHTS:
+ weight = label["name"][1:]
if weight == "1/2":
weight = "0.5"
else:
- labels.append(l["name"])
+ labels.append(label["name"])
if not weight:
continue
labels = ", ".join(labels)Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.