From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:12:25 +0000 (+0200) Subject: [3.14] GH-129805: Clean up some changes from GH-129806 (GH-133540) (#138972) X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c03e9078d8b41b3e558aab2b09face5e12b308c;p=thirdparty%2FPython%2Fcpython.git [3.14] GH-129805: Clean up some changes from GH-129806 (GH-133540) (#138972) Co-authored-by: Brandt Bucher --- diff --git a/Tools/jit/_stencils.py b/Tools/jit/_stencils.py index 03b0ba647b0d..5977a7a30502 100644 --- a/Tools/jit/_stencils.py +++ b/Tools/jit/_stencils.py @@ -140,11 +140,7 @@ class Hole: def __post_init__(self) -> None: self.func = _PATCH_FUNCS[self.kind] - def fold( - self, - other: typing.Self, - body: bytes | bytearray, - ) -> typing.Self | None: + def fold(self, other: typing.Self, body: bytearray) -> typing.Self | None: """Combine two holes into a single hole, if possible.""" instruction_a = int.from_bytes( body[self.offset : self.offset + 4], byteorder=sys.byteorder diff --git a/Tools/jit/_targets.py b/Tools/jit/_targets.py index b383e39da194..ed63e388e433 100644 --- a/Tools/jit/_targets.py +++ b/Tools/jit/_targets.py @@ -114,7 +114,7 @@ class _Target(typing.Generic[_S, _R]): raise NotImplementedError(type(self)) def _handle_relocation( - self, base: int, relocation: _R, raw: bytes | bytearray + self, base: int, relocation: _R, raw: bytearray ) -> _stencils.Hole: raise NotImplementedError(type(self)) @@ -282,10 +282,7 @@ class _COFF( return _stencils.symbol_to_value(name) def _handle_relocation( - self, - base: int, - relocation: _schema.COFFRelocation, - raw: bytes | bytearray, + self, base: int, relocation: _schema.COFFRelocation, raw: bytearray ) -> _stencils.Hole: match relocation: case { @@ -380,10 +377,7 @@ class _ELF( }, section_type def _handle_relocation( - self, - base: int, - relocation: _schema.ELFRelocation, - raw: bytes | bytearray, + self, base: int, relocation: _schema.ELFRelocation, raw: bytearray ) -> _stencils.Hole: symbol: str | None match relocation: @@ -459,10 +453,7 @@ class _MachO( stencil.holes.append(hole) def _handle_relocation( - self, - base: int, - relocation: _schema.MachORelocation, - raw: bytes | bytearray, + self, base: int, relocation: _schema.MachORelocation, raw: bytearray ) -> _stencils.Hole: symbol: str | None match relocation: