Skip to content

Commit 407abef

Browse files
committed
Ignore F541
1 parent d4c5707 commit 407abef

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

Tools/build/.ruff.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ select = [
1919
]
2020
ignore = [
2121
"E501", # Line too long
22+
"F541", # f-string without any placeholders
2223
]
2324

2425
[per-file-target-version]

Tools/build/deepfreeze.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def generate_unicode(self, name: str, s: str) -> str:
235235
utf8 = s.encode('utf-8')
236236
self.write(f'.utf8 = {make_string_literal(utf8)},')
237237
self.write(f'.utf8_length = {len(utf8)},')
238-
with self.block("._data =", ","):
238+
with self.block(f"._data =", ","):
239239
for i in range(0, len(s), 16):
240240
data = s[i:i+16]
241241
self.write(", ".join(map(str, map(ord, data))) + ",")
@@ -292,7 +292,7 @@ def generate_code(self, name: str, code: types.CodeType) -> str:
292292
self.write(f".co_name = {co_name},")
293293
self.write(f".co_qualname = {co_qualname},")
294294
self.write(f".co_linetable = {co_linetable},")
295-
self.write("._co_cached = NULL,")
295+
self.write(f"._co_cached = NULL,")
296296
self.write(f".co_code_adaptive = {co_code_adaptive},")
297297
first_traceable = 0
298298
for op in code.co_code[::2]:
@@ -307,7 +307,7 @@ def generate_code(self, name: str, code: types.CodeType) -> str:
307307

308308
def generate_tuple(self, name: str, t: tuple[object, ...]) -> str:
309309
if len(t) == 0:
310-
return "(PyObject *)& _Py_SINGLETON(tuple_empty)"
310+
return f"(PyObject *)& _Py_SINGLETON(tuple_empty)"
311311
items = [self.generate(f"{name}_{i}", it) for i, it in enumerate(t)]
312312
self.write("static")
313313
with self.indent():
@@ -321,7 +321,7 @@ def generate_tuple(self, name: str, t: tuple[object, ...]) -> str:
321321
with self.block("._object =", ","):
322322
self.object_var_head("PyTuple_Type", len(t))
323323
if items:
324-
with self.block(".ob_item =", ","):
324+
with self.block(f".ob_item =", ","):
325325
for item in items:
326326
self.write(item + ",")
327327
return f"& {name}._object.ob_base.ob_base"
@@ -472,10 +472,10 @@ def generate(args: list[str], output: TextIO) -> None:
472472
else:
473473
code = compile(fd.read(), f"<frozen {modname}>", "exec")
474474
printer.generate_file(modname, code)
475-
with printer.block("void\n_Py_Deepfreeze_Fini(void)"):
475+
with printer.block(f"void\n_Py_Deepfreeze_Fini(void)"):
476476
for p in printer.finis:
477477
printer.write(p)
478-
with printer.block("int\n_Py_Deepfreeze_Init(void)"):
478+
with printer.block(f"int\n_Py_Deepfreeze_Init(void)"):
479479
for p in printer.inits:
480480
with printer.block(f"if ({p} < 0)"):
481481
printer.write("return -1;")

Tools/build/freeze_modules.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ def regen_pcbuild(modules):
631631
projlines.append(f' <ModName>{src.frozenid}</ModName>')
632632
projlines.append(f' <IntFile>$(IntDir){intfile}</IntFile>')
633633
projlines.append(f' <OutFile>$(GeneratedFrozenModulesDir){header}</OutFile>')
634-
projlines.append(' </None>')
634+
projlines.append(f' </None>')
635635

636636
filterlines.append(f' <None Include="..\\{pyfile}">')
637637
filterlines.append(' <Filter>Python Files</Filter>')

Tools/build/generate_global_objects.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,19 +366,19 @@ def generate_static_strings_initializer(identifiers, strings):
366366
printer.write(START)
367367
printer.write("static inline void")
368368
with printer.block("_PyUnicode_InitStaticStrings(PyInterpreterState *interp)"):
369-
printer.write('PyObject *string;')
369+
printer.write(f'PyObject *string;')
370370
for i in sorted(identifiers):
371371
# This use of _Py_ID() is ignored by iter_global_strings()
372372
# since iter_files() ignores .h files.
373373
printer.write(f'string = &_Py_ID({i});')
374-
printer.write('_PyUnicode_InternStatic(interp, &string);')
375-
printer.write('assert(_PyUnicode_CheckConsistency(string, 1));')
376-
printer.write('assert(PyUnicode_GET_LENGTH(string) != 1);')
374+
printer.write(f'_PyUnicode_InternStatic(interp, &string);')
375+
printer.write(f'assert(_PyUnicode_CheckConsistency(string, 1));')
376+
printer.write(f'assert(PyUnicode_GET_LENGTH(string) != 1);')
377377
for value, name in sorted(strings.items()):
378378
printer.write(f'string = &_Py_STR({name});')
379-
printer.write('_PyUnicode_InternStatic(interp, &string);')
380-
printer.write('assert(_PyUnicode_CheckConsistency(string, 1));')
381-
printer.write('assert(PyUnicode_GET_LENGTH(string) != 1);')
379+
printer.write(f'_PyUnicode_InternStatic(interp, &string);')
380+
printer.write(f'assert(_PyUnicode_CheckConsistency(string, 1));')
381+
printer.write(f'assert(PyUnicode_GET_LENGTH(string) != 1);')
382382
printer.write(END)
383383
printer.write(after)
384384

Tools/build/stable_abi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def test_windows_feature_macros(self):
337337
write(")")
338338
for ifdef, names in optional_items.items():
339339
write(f"if feature_macros[{ifdef!r}]:")
340-
write(" SYMBOL_NAMES += (")
340+
write(f" SYMBOL_NAMES += (")
341341
for name in names:
342342
write(f" {name!r},")
343343
write(" )")

0 commit comments

Comments
 (0)