Skip to content
Snippets Groups Projects
Commit e0960526 authored by Julian Gilbey's avatar Julian Gilbey
Browse files

New upstream version, incorporating INTRINSIC patch

parent c3637465
No related branches found
No related tags found
No related merge requests found
Pipeline #590116 passed
python-bytecode (0.15.1-1) unstable; urgency=medium
* New upstream version 0.15.1
* INTRINSIC patch now incorporated upstream
-- Julian Gilbey <jdg@debian.org> Fri, 13 Oct 2023 12:09:46 +0100
python-bytecode (0.15.0-1) unstable; urgency=medium
* New upstream version 0.15.0
......
From: Julian Gilbey <jdg@debian.org>
Subject: Fix spelling of INTRINSIC
Last-Update: 2023-10-12
Forwarded: https://github.com/MatthieuDartiailh/bytecode/pull/131
---
doc/api.rst | 12 ++++++------
doc/changelog.rst | 2 +-
src/bytecode/instr.py | 8 ++++----
tests/test_instr.py | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/doc/api.rst b/doc/api.rst
index cf91ba8..db54cae 100644
--- a/doc/api.rst
+++ b/doc/api.rst
@@ -351,11 +351,11 @@ Intrinsic operations
.. class:: Intrinsic1Op
- Enum for the argument of the ``CALL_INSTRINSIC_1`` instruction (3.12+).
+ Enum for the argument of the ``CALL_INTRINSIC_1`` instruction (3.12+).
- ``INSTRINSIC_1_INVALID``
- ``INSTRINSIC_PRINT``
- ``INSTRINSIC_IMPORT_STAR``
+ ``INTRINSIC_1_INVALID``
+ ``INTRINSIC_PRINT``
+ ``INTRINSIC_IMPORT_STAR``
``INTRINSIC_STOPITERATION_ERROR``
``INTRINSIC_ASYNC_GEN_WRAP``
``INTRINSIC_UNARY_POSITIVE``
@@ -368,9 +368,9 @@ Intrinsic operations
.. class:: Intrinsic2Op
- Enum for the argument of the ``CALL_INSTRINSIC_2`` instruction (3.12+).
+ Enum for the argument of the ``CALL_INTRINSIC_2`` instruction (3.12+).
- ``INSTRINSIC_2_INVALID``
+ ``INTRINSIC_2_INVALID``
``INTRINSIC_PREP_RERAISE_STAR``
``INTRINSIC_TYPEVAR_WITH_BOUND``
``INTRINSIC_TYPEVAR_WITH_CONSTRAINTS``
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 01a1950..f252f50 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -17,7 +17,7 @@ New features:
a ``tuple[bool, bool, str]`` as argument
- ``POP_JUMP_IF_*`` instructions are undirected in Python 3.12
- ``YIELD_VALUE`` now takes an argument
- - Support for ``CALL_INSTRINSIC_1/2`` led to the addition of 2 new enums to
+ - Support for ``CALL_INTRINSIC_1/2`` led to the addition of 2 new enums to
represent the argument
2023-05-24: Version 0.14.2
diff --git a/src/bytecode/instr.py b/src/bytecode/instr.py
index f65e5af..95e1c43 100644
--- a/src/bytecode/instr.py
+++ b/src/bytecode/instr.py
@@ -104,9 +104,9 @@ class BinaryOp(enum.IntEnum):
@enum.unique
class Intrinsic1Op(enum.IntEnum):
- INSTRINSIC_1_INVALID = 0
- INSTRINSIC_PRINT = 1
- INSTRINSIC_IMPORT_STAR = 2
+ INTRINSIC_1_INVALID = 0
+ INTRINSIC_PRINT = 1
+ INTRINSIC_IMPORT_STAR = 2
INTRINSIC_STOPITERATION_ERROR = 3
INTRINSIC_ASYNC_GEN_WRAP = 4
INTRINSIC_UNARY_POSITIVE = 5
@@ -120,7 +120,7 @@ class Intrinsic1Op(enum.IntEnum):
@enum.unique
class Intrinsic2Op(enum.IntEnum):
- INSTRINSIC_2_INVALID = 0
+ INTRINSIC_2_INVALID = 0
INTRINSIC_PREP_RERAISE_STAR = 1
INTRINSIC_TYPEVAR_WITH_BOUND = 2
INTRINSIC_TYPEVAR_WITH_CONSTRAINTS = 3
diff --git a/tests/test_instr.py b/tests/test_instr.py
index d36c315..4952ab2 100644
--- a/tests/test_instr.py
+++ b/tests/test_instr.py
@@ -208,7 +208,7 @@ class InstrTests(TestCase):
for name in [opcode.opname[i] for i in INTRINSIC_1OP]:
self.assertRaises(TypeError, Instr, name, 1)
- Instr(name, Intrinsic1Op.INSTRINSIC_PRINT)
+ Instr(name, Intrinsic1Op.INTRINSIC_PRINT)
for name in [opcode.opname[i] for i in INTRINSIC_2OP]:
self.assertRaises(TypeError, Instr, name, 1)
--
2.42.0
......@@ -61,7 +61,7 @@ Forwarded: not-needed
)
instructions[index] = instr
nb_extended_args = 0
@@ -1057,7 +1064,7 @@
@@ -1058,7 +1065,7 @@
instr_index = len(instructions)
jumps.append((instr_index, jump_target))
......@@ -72,7 +72,7 @@ Forwarded: not-needed
if current_instr_offset in ex_end:
--- a/src/bytecode/instr.py
+++ b/src/bytecode/instr.py
@@ -520,7 +520,7 @@
@@ -522,7 +522,7 @@
class BaseInstr(Generic[A]):
"""Abstract instruction."""
......@@ -81,7 +81,7 @@ Forwarded: not-needed
# Work around an issue with the default value of arg
def __init__(
@@ -530,8 +530,10 @@
@@ -532,8 +532,10 @@
*,
lineno: Union[int, None, _UNSET] = UNSET,
location: Optional[InstrLocation] = None,
......@@ -92,7 +92,7 @@ Forwarded: not-needed
if location:
self._location = location
elif lineno is UNSET:
@@ -656,7 +658,7 @@
@@ -658,7 +660,7 @@
return (_effect, 0)
def copy(self: T) -> T:
......
pydevd-add-offset-to-instructions.patch
Fix-spelling-of-INTRINSIC.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment