michaelh/zephyr
1
0
Fork 0
Code Releases Activity

style: edtlib: Use a better format string

Browse source 
Use f-strings as recommended by PEP-8
instead of the .format() method.

Signed-off-by: James Roy <rruuaanng@outlook.com>
This commit is contained in:
James Roy 2025-01-08 21:46:02 +08:00 • committed by Benjamin Cabé
commit 34bc4c3e3e
3 changed files with 28 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.ruff-excludes.toml
View file

@ -440,7 +440,6 @@
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports "I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
"SIM201", # https://docs.astral.sh/ruff/rules/negate-equal-op "SIM201", # https://docs.astral.sh/ruff/rules/negate-equal-op
"UP007", # https://docs.astral.sh/ruff/rules/non-pep604-annotation "UP007", # https://docs.astral.sh/ruff/rules/non-pep604-annotation
"UP032", # https://docs.astral.sh/ruff/rules/f-string
"UP035", # https://docs.astral.sh/ruff/rules/deprecated-import "UP035", # https://docs.astral.sh/ruff/rules/deprecated-import
"UP037", # https://docs.astral.sh/ruff/rules/quoted-annotation "UP037", # https://docs.astral.sh/ruff/rules/quoted-annotation
] ]
@ -453,7 +452,6 @@
"SIM118", # https://docs.astral.sh/ruff/rules/in-dict-keys "SIM118", # https://docs.astral.sh/ruff/rules/in-dict-keys
"UP007", # https://docs.astral.sh/ruff/rules/non-pep604-annotation "UP007", # https://docs.astral.sh/ruff/rules/non-pep604-annotation
"UP015", # https://docs.astral.sh/ruff/rules/redundant-open-modes "UP015", # https://docs.astral.sh/ruff/rules/redundant-open-modes
"UP032", # https://docs.astral.sh/ruff/rules/f-string
"UP035", # https://docs.astral.sh/ruff/rules/deprecated-import "UP035", # https://docs.astral.sh/ruff/rules/deprecated-import
"UP037", # https://docs.astral.sh/ruff/rules/quoted-annotation "UP037", # https://docs.astral.sh/ruff/rules/quoted-annotation
] ]

57
scripts/dts/python-devicetree/src/devicetree/dtlib.py
View file

@ -381,10 +381,9 @@ class Property:
unsigned. unsigned.
""" """
if self.type is not Type.NUM: if self.type is not Type.NUM:
_err("expected property '{0}' on {1} in {2} to be assigned with " _err(f"expected property '{self.name}' on {self.node.path} in "
"'{0} = < (number) >;', not '{3}'" f"{self.node.dt.filename} to be assigned with "
.format(self.name, self.node.path, self.node.dt.filename, f"'{self.name} = < (number) >;', not '{self}'")
self))
return int.from_bytes(self.value, "big", signed=signed) return int.from_bytes(self.value, "big", signed=signed)
@ -402,10 +401,9 @@ class Property:
unsigned. unsigned.
""" """
if self.type not in (Type.NUM, Type.NUMS): if self.type not in (Type.NUM, Type.NUMS):
_err("expected property '{0}' on {1} in {2} to be assigned with " _err(f"expected property '{self.name}' on {self.node.path} in "
"'{0} = < (number) (number) ... >;', not '{3}'" f"{self.node.dt.filename} to be assigned with "
.format(self.name, self.node.path, self.node.dt.filename, f"'{self.name} = < (number) (number) ... >;', not '{self}'")
self))
return [int.from_bytes(self.value[i:i + 4], "big", signed=signed) return [int.from_bytes(self.value[i:i + 4], "big", signed=signed)
for i in range(0, len(self.value), 4)] for i in range(0, len(self.value), 4)]
@ -421,10 +419,9 @@ class Property:
foo = [ 01 ... ]; foo = [ 01 ... ];
""" """
if self.type is not Type.BYTES: if self.type is not Type.BYTES:
_err("expected property '{0}' on {1} in {2} to be assigned with " _err(f"expected property '{self.name}' on {self.node.path} "
"'{0} = [ (byte) (byte) ... ];', not '{3}'" f"in {self.node.dt.filename} to be assigned with "
.format(self.name, self.node.path, self.node.dt.filename, f"'{self.name} = [ (byte) (byte) ... ];', not '{self}'")
self))
return self.value return self.value
@ -441,10 +438,9 @@ class Property:
not valid UTF-8. not valid UTF-8.
""" """
if self.type is not Type.STRING: if self.type is not Type.STRING:
_err("expected property '{0}' on {1} in {2} to be assigned with " _err(f"expected property '{self.name}' on {self.node.path} "
"'{0} = \"string\";', not '{3}'" f"in {self.node.dt.filename} to be assigned with "
.format(self.name, self.node.path, self.node.dt.filename, f"'{self.name} = \"string\";', not '{self}'")
self))
try: try:
ret = self.value.decode("utf-8")[:-1] # Strip null ret = self.value.decode("utf-8")[:-1] # Strip null
@ -467,10 +463,9 @@ class Property:
Also raises DTError if any of the strings are not valid UTF-8. Also raises DTError if any of the strings are not valid UTF-8.
""" """
if self.type not in (Type.STRING, Type.STRINGS): if self.type not in (Type.STRING, Type.STRINGS):
_err("expected property '{0}' on {1} in {2} to be assigned with " _err(f"expected property '{self.name}' on {self.node.path} in "
"'{0} = \"string\", \"string\", ... ;', not '{3}'" f"{self.node.dt.filename} to be assigned with "
.format(self.name, self.node.path, self.node.dt.filename, f"'{self.name} = \"string\", \"string\", ... ;', not '{self}'")
self))
try: try:
ret = self.value.decode("utf-8").split("\0")[:-1] ret = self.value.decode("utf-8").split("\0")[:-1]
@ -491,10 +486,9 @@ class Property:
foo = < &bar >; foo = < &bar >;
""" """
if self.type is not Type.PHANDLE: if self.type is not Type.PHANDLE:
_err("expected property '{0}' on {1} in {2} to be assigned with " _err(f"expected property '{self.name}' on {self.node.path} in "
"'{0} = < &foo >;', not '{3}'" f"{self.node.dt.filename} to be assigned with "
.format(self.name, self.node.path, self.node.dt.filename, f"'{self.name} = < &foo >;', not '{self}'")
self))
return self.node.dt.phandle2node[int.from_bytes(self.value, "big")] return self.node.dt.phandle2node[int.from_bytes(self.value, "big")]
@ -517,10 +511,9 @@ class Property:
return self.type is Type.NUMS and not self.value return self.type is Type.NUMS and not self.value
if not type_ok(): if not type_ok():
_err("expected property '{0}' on {1} in {2} to be assigned with " _err(f"expected property '{self.name}' on {self.node.path} in "
"'{0} = < &foo &bar ... >;', not '{3}'" f"{self.node.dt.filename} to be assigned with "
.format(self.name, self.node.path, f"'{self.name} = < &foo &bar ... >;', not '{self}'")
self.node.dt.filename, self))
return [self.node.dt.phandle2node[int.from_bytes(self.value[i:i + 4], return [self.node.dt.phandle2node[int.from_bytes(self.value[i:i + 4],
"big")] "big")]
@ -539,10 +532,10 @@ class Property:
For the second case, DTError is raised if the path does not exist. For the second case, DTError is raised if the path does not exist.
""" """
if self.type not in (Type.PATH, Type.STRING): if self.type not in (Type.PATH, Type.STRING):
_err("expected property '{0}' on {1} in {2} to be assigned with " _err(f"expected property '{self.name}' on {self.node.path} in "
"either '{0} = &foo' or '{0} = \"/path/to/node\"', not '{3}'" f"{self.node.dt.filename} to be assigned with either "
.format(self.name, self.node.path, self.node.dt.filename, f"'{self.name} = &foo' or '{self.name} = \"/path/to/node\"', "
self)) f"not '{self}'")
try: try:
path = self.value.decode("utf-8")[:-1] path = self.value.decode("utf-8")[:-1]

8
scripts/dts/python-devicetree/src/devicetree/edtlib.py
View file

@ -1533,11 +1533,9 @@ class Node:
if prop_type == "boolean": if prop_type == "boolean":
if prop.type != Type.EMPTY: if prop.type != Type.EMPTY:
_err( _err(f"'{name}' in {node!r} is defined with 'type: boolean' "
"'{0}' in {1!r} is defined with 'type: boolean' in {2}, " f"in {binding_path}, but is assigned a value ('{prop}') "
"but is assigned a value ('{3}') instead of being empty " f"instead of being empty ('{name};')")
"('{0};')".format(name, node, binding_path, prop)
)
return True return True
if prop_type == "int": if prop_type == "int":