hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-22 01:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix remaining ruff check issues

Browse source 
Two if conditions compressed into one.
Two open() marked as ignored by SIM115 (use context manager for opening files)
because it'd require too much restructuring.
And one open() ... close()  changed to a context manager, the diff
is the reindentation of everything between open and close.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2327>
This commit is contained in:
Peter Hutterer 2026-09-17 10:20:42 +10:00 • committed by Alan Coopersmith
commit eb9292efdb
2 changed files with 44 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci/whitespace-check.py
View file

@ -101,10 +101,12 @@ def main():
errors.extend(test_tab_indent(lines))
errors.extend(test_tab_after_space(lines))
errors.extend(test_trailing_whitespace(lines))
if any(file.name.endswith(suffix) for suffix in [".c", ".h"]):
if file.parts[0] != "include":
errors.extend(test_duplicate_empty_lines(lines))
errors.extend(test_empty_line_between_braces(lines))
if (
any(file.name.endswith(suffix) for suffix in [".c", ".h"])
and file.parts[0] != "include"
):
errors.extend(test_duplicate_empty_lines(lines))
errors.extend(test_empty_line_between_braces(lines))
for e in errors:
print(f"{red}ERROR: {e.message} in {file}:{reset}", file=sys.stderr)

71
hw/xwin/glx/gen_gl_wrappers.py
View file

@ -122,10 +122,10 @@ genOpts = CGeneratorOptions(
# create error/warning & diagnostic files
if errFilename:
errWarn = open(errFilename, "w")
errWarn = open(errFilename, "w") # noqa: SIM115
else:
errWarn = sys.stderr
diag = open(diagFilename, "w")
diag = open(diagFilename, "w") # noqa: SIM115
def ParseCmdRettype(cmd):
@ -477,9 +477,7 @@ class ShimOutputGenerator(OutputGenerator):
self.outFile.write(f' RESOLVE(PFN{name.upper()}PROC, "{name}");\n')
self.outFile.write(" RESOLVED_PROC(")
else:
self.outFile.write(
f' RESOLVE_RET(PFN{name.upper()}PROC, "{name}", 0);\n'
)
self.outFile.write(f' RESOLVE_RET(PFN{name.upper()}PROC, "{name}", 0);\n')
self.outFile.write(" return RESOLVED_PROC(")
Comma = ""
@ -491,41 +489,42 @@ class ShimOutputGenerator(OutputGenerator):
def genHeaders():
outFile = open(outFilename, "w")
with open(outFilename, "w") as outFile:
if preresolve:
gen = PreResolveOutputGenerator(
errFile=errWarn, warnFile=errWarn, diagFile=diag
)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if preresolve:
gen = PreResolveOutputGenerator(
errFile=errWarn, warnFile=errWarn, diagFile=diag
)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if wrapper:
gen = WrapperOutputGenerator(
errFile=errWarn, warnFile=errWarn, diagFile=diag
)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if wrapper:
gen = WrapperOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if shim:
gen = ShimOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if shim:
gen = ShimOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if thunk:
gen = ThunkOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if thunk:
gen = ThunkOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
if thunkdefs:
gen = ThunkDefsOutputGenerator(errFile=errWarn, warnFile=errWarn, diagFile=diag)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
outFile.close()
if thunkdefs:
gen = ThunkDefsOutputGenerator(
errFile=errWarn, warnFile=errWarn, diagFile=diag
)
gen.outFile = outFile
reg.setGenerator(gen)
reg.apiGen(genOpts)
genHeaders()