Skip to content

Use ast.unparse for generating patches with lib_updater.py #6142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 12 commits into from
Sep 11, 2025
Merged

Use ast.unparse for generating patches with lib_updater.py #6142

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dd5661c
Use `ast.unparse` for decorator generation
ShaharNaveh Sep 9, 2025
e0b7984
Cleanup code a bit
ShaharNaveh Sep 9, 2025
25c5569
Use `ast.unparse` for every ut_method
ShaharNaveh Sep 9, 2025
30d1294
use textwrap
ShaharNaveh Sep 9, 2025
efdcfcc
Apply patches to `test_os.py`
ShaharNaveh Sep 9, 2025
4096e86
Apoly on `test_xml_etree.py`
ShaharNaveh Sep 9, 2025
9633595
Ensure ut_method type for external patches
ShaharNaveh Sep 9, 2025
bc8f77f
Run on some test files
ShaharNaveh Sep 9, 2025
aa50293
Mark failing test
ShaharNaveh Sep 9, 2025
aa95d8f
Update `test_str.py`
ShaharNaveh Sep 9, 2025
1966c3e
Update `test_logging.py` from 3.13.7
ShaharNaveh Sep 9, 2025
b4bf5ec
Merge remote-tracking branch 'upstream/main' into fix-lib-updater-bugs
ShaharNaveh Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use ast.unparse for every ut_method
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Sep 9, 2025
commit 25c5569914e4ae041c76c6f4939acc5831df51b5
33 changes: 21 additions & 12 deletions scripts/lib_updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,31 @@ class PatchSpec(typing.NamedTuple):
cond: str | None = None
reason: str = ""

def as_decorator(self) -> str:
reason = f"{COMMENT}; {self.reason}".strip(" ;")
@property
def _reason(self) -> str:
return f"{COMMENT}; {self.reason}".strip(" ;")

@property
def _attr_node(self) -> ast.Attribute:
return ast.Attribute(value=ast.Name(id=UT), attr=self.ut_method)

def as_ast_node(self) -> ast.Attribute | ast.Call:
if not self.ut_method.has_args():
return f"@{UT}.{self.ut_method} # {reason}"
return self._attr_node

args = []
if self.cond:
args.append(ast.parse(self.cond).body[0].value)
args.append(ast.Constant(value=reason))
args.append(ast.Constant(value=self._reason))

return ast.Call(func=self._attr_node, args=args, keywords=[])

def as_decorator(self) -> str:
unparsed = ast.unparse(self.as_ast_node())

if not self.ut_method.has_args():
unparsed = f"{unparsed} # {self._reason}"

call_node = ast.Call(
func=ast.Attribute(value=ast.Name(id=UT), attr=self.ut_method),
args=args,
keywords=[],
)
unparsed = ast.unparse(call_node)
return f"@{unparsed}"


Expand Down Expand Up @@ -218,14 +227,14 @@ def build_patch_dict(it: "Iterator[PatchEntry]") -> Patches:


def iter_patch_lines(tree: ast.Module, patches: Patches) -> "Iterator[tuple[int, str]]":
cache = {} # Used in phase 2
cache = {} # Used in phase 2. Stores the end line location of a class name.

# Phase 1: Iterate and mark existing tests
for cls_node, fn_node in iter_tests(tree):
cache[cls_node.name] = cls_node.end_lineno
specs = patches.get(cls_node.name, {}).pop(fn_node.name, None)
if not specs:
continue
cache[cls_node.name] = cls_node.end_lineno

lineno = min(
(dec_node.lineno for dec_node in fn_node.decorator_list),
Expand Down