crosshair-tool 0.0.84__tar.gz → 0.0.85__tar.gz

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crosshair-tool
-Version: 0.0.84
+Version: 0.0.85
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/__init__.py

@@ -15,7 +15,7 @@ from crosshair.statespace import StateSpace
 from crosshair.tracers import NoTracing, ResumedTracing
 from crosshair.util import IgnoreAttempt, debug
 
-__version__ = "0.0.84"  # Do not forget to update in setup.py!
+__version__ = "0.0.85"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/_mark_stacks.h

@@ -538,31 +538,6 @@ static const uint8_t _ch_DE_INSTRUMENT[256] = {
 #endif
 #endif
 
-static const uint8_t _ch_TRACABLE_INSTRUCTIONS[256] = {
-    // This must be manually kept in sync the the various
-    // instructions that we care about on the python side.
-    [MAP_ADD] = 1,
-    [BINARY_SUBSCR] = 1,
-    [BINARY_SLICE] = 1,
-    [CONTAINS_OP] = 1,
-    [BUILD_STRING] = 1,
-#if PY_VERSION_HEX < 0x030D0000
-    // <= 3.12
-    [FORMAT_VALUE] = 1,
-#elif PY_VERSION_HEX < 0x030E0000
-    // 3.13
-    [CALL_KW] = 1,
-    [CONVERT_VALUE] = 1,
-#endif
-    [UNARY_NOT] = 1,
-    [SET_ADD] = 1,
-    [IS_OP] = 1,
-    [BINARY_OP] = 1,
-    [CALL] = 1,
-    [CALL_FUNCTION_EX] = 1,
-};
-
-
 /* Get the underlying opcode, stripping instrumentation */
 int _ch_Py_GetBaseOpcode(PyCodeObject *code, int i)
 {

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/_tracers.c

@@ -17,20 +17,69 @@
 #include <opcode.h>
 
 #define Py_BUILD_CORE
+#define NEED_OPCODE_METADATA
 
-#if PY_VERSION_HEX >= 0x030C0000
-#include "_mark_stacks.h"
-#endif
 
 #include "_tracers_pycompat.h"
+#include "internal/pycore_code.h"
+
+#if PY_VERSION_HEX >= 0x030D0000
+// Python 3.13+
+#include "internal/pycore_opcode_metadata.h"
+#endif
+
 #include "_tracers.h"
 
 #include "frameobject.h"
 
 #if PY_VERSION_HEX >= 0x030B0000
+// Python 3.11+
 #include "internal/pycore_frame.h"
 #endif
 
+
+#if PY_VERSION_HEX >= 0x030C0000
+// Python 3.12+
+const uint8_t _ch_TRACABLE_INSTRUCTIONS[256] = {
+    // This must be manually kept in sync the the various
+    // instructions that we care about on the python side.
+    [MAP_ADD] = 1,
+    [BINARY_SLICE] = 1,
+    [CONTAINS_OP] = 1,
+    [BUILD_STRING] = 1,
+#if PY_VERSION_HEX < 0x030D0000
+    // <= 3.12
+    [FORMAT_VALUE] = 1,
+    [BINARY_SUBSCR] = 1,
+#elif PY_VERSION_HEX < 0x030E0000
+    // == 3.13
+    [CALL_KW] = 1,
+    [CONVERT_VALUE] = 1,
+    [BINARY_SUBSCR] = 1,
+#elif PY_VERSION_HEX < 0x030F0000
+    // == 3.14
+    [CALL_KW] = 1,
+    [CONVERT_VALUE] = 1,
+#endif
+    [UNARY_NOT] = 1,
+    [SET_ADD] = 1,
+    [IS_OP] = 1,
+    [BINARY_OP] = 1,
+    [CALL] = 1,
+    [CALL_FUNCTION_EX] = 1,
+};
+#endif
+
+
+#if PY_VERSION_HEX >= 0x030C0000
+#if PY_VERSION_HEX < 0x030E0000
+// Python 3.12 & 3.13
+#define CH_STACK_COMPUTATION 1
+#include "_mark_stacks.h"
+#endif
+#endif
+
+
 static int
 pyint_as_int(PyObject * pyint, int *pint)
 {
@@ -92,8 +141,7 @@ CTracer_dealloc(CTracer *self)
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
-#if PY_VERSION_HEX >= 0x030C0000
-// Python 3.12
+#if CH_STACK_COMPUTATION
 
 #define _CODE_STACK_CACHE_CAPACITY 64
 static CodeAndStacks _CODE_STACK_CACHE[_CODE_STACK_CACHE_CAPACITY];
@@ -183,7 +231,7 @@ CTracer_push_module(CTracer *self, PyObject *args)
             continue;
         }
 #if PY_VERSION_HEX >= 0x030C0000
-// Python 3.12
+// Python 3.12+
         if (! _ch_TRACABLE_INSTRUCTIONS[opcode]) {
             self->trace_all_opcodes = TRUE;
             // sys.monitoring also will need to be reset, but that happens at the python layer above
@@ -293,12 +341,36 @@ static int
 CTracer_handle_opcode(CTracer *self, PyCodeObject* pCode, int lasti)
 {
 
-#if PY_VERSION_HEX >= 0x030C0000
-// Python 3.12
+#if CH_STACK_COMPUTATION
+if (!self->trace_all_opcodes) {
+    int64_t *stacks = _ch_get_stacks(pCode);
+    uint8_t at_enabled_position = stacks[lasti / 2] & 1;
+    if (!at_enabled_position) {
+        return RET_DISABLE_TRACING;
+    }
+}
+#elif PY_VERSION_HEX >= 0x030E0000
+// Python 3.14+
     if (!self->trace_all_opcodes) {
-        int64_t *stacks = _ch_get_stacks(pCode);
-        uint8_t at_enabled_position = stacks[lasti / 2] & 1;
-        if (!at_enabled_position) {
+        PyBytesObject *code_bytes = PyCode_GetCode(pCode);
+        int opcode = code_bytes->ob_sval[lasti];
+        int last_opcode = 255;
+        uint8_t at_enabled_position = _ch_TRACABLE_INSTRUCTIONS[opcode];
+        uint8_t last_instr_enabled = 0;
+        if (lasti > 1) {
+            // TODO: This seems wrong; it doesn't account for extended args or cache entries;
+            last_opcode = code_bytes->ob_sval[lasti - 2];
+            last_instr_enabled = _ch_TRACABLE_INSTRUCTIONS[last_opcode];
+        }
+        // printf("lasti: %d, func: %s, opcode: %s, last opcode (%s) enabled: %d -> %d\n",  lasti,
+        //        PyUnicode_AsUTF8(pCode->co_name) ? PyUnicode_AsUTF8(pCode->co_name) : "<unknown>",
+        //        _PyOpcode_OpName[opcode] ? _PyOpcode_OpName[opcode] : "<unknown>",
+        //        _PyOpcode_OpName[last_opcode] ? _PyOpcode_OpName[last_opcode] : "<unknown>",
+        //        last_instr_enabled,
+        //        at_enabled_position
+        //     );
+
+        if ((!last_instr_enabled) && (!at_enabled_position)) {
             return RET_DISABLE_TRACING;
         }
     }
@@ -860,7 +932,12 @@ TraceSwapType = {
 
 
 static PyObject **crosshair_tracers_stack_lookup(PyFrameObject *frame, int index) {
-#if PY_VERSION_HEX >= 0x030C0000
+#if PY_VERSION_HEX >= 0x030E0000
+    // Python 3.14+
+    PyCodeObject* code = _PyFrame_GetCodeBorrow(frame);
+    _PyInterpreterFrame* interpreterFrame = frame->f_frame;
+    return &(interpreterFrame->stackpointer[index]);
+#elif PY_VERSION_HEX >= 0x030C0000
     // Python 3.12
     PyCodeObject* code = _PyFrame_GetCodeBorrow(frame);
     _PyInterpreterFrame* interpreterFrame = frame->f_frame;
@@ -900,7 +977,7 @@ static PyObject *crosshair_tracers_stack_read(PyObject *self, PyObject *args)
         return NULL;
     }
     PyObject *ret = *retaddr;
-    if (ret == NULL) {
+    if (ret == NULL || ret == 1) {  // starting in 3.14, we sometimes see a sentinal 0x1 pointer (?)
         PyErr_SetString(PyExc_ValueError, "No stack value is present");
         return NULL;
     } else {
@@ -937,7 +1014,7 @@ static PyObject* crosshair_tracers_code_stack_depths(PyObject *self, PyObject *a
         return NULL;
     }
 
-#if PY_VERSION_HEX >= 0x030C0000
+#if CH_STACK_COMPUTATION
     // Python 3.12
     int64_t *stacks = _ch_get_stacks(code);
     int codelen = (int)Py_SIZE(code);
@@ -961,7 +1038,7 @@ static PyObject* crosshair_tracers_supported_opcodes(PyObject *self, PyObject *a
         return NULL;
     }
 #if PY_VERSION_HEX >= 0x030C0000
-    // Python 3.12
+    // Python 3.12+
     PyObject* python_val = PyList_New(0);
     for (int i = 0; i < 256; i++) {
         if (_ch_TRACABLE_INSTRUCTIONS[i]) {

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/_tracers.h

@@ -88,4 +88,6 @@ typedef struct TraceSwap {
 
 extern PyTypeObject TraceSwapType;
 
+extern const uint8_t _ch_TRACABLE_INSTRUCTIONS[256];
+
 #endif /* _COVERAGE_TRACER_H */

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/_tracers_test.py

@@ -89,7 +89,10 @@ def _log_execution_stacks(fn, *a, **kw):
     return stacks
 
 
-@pytest.mark.skipif(sys.version_info < (3, 12), reason="stack depth on 3.12+")
+@pytest.mark.skipif(
+    sys.version_info < (3, 12) or sys.version_info >= (3, 14),
+    reason="stack depths only in 3.12 & 3.13",
+)
 def test_one_function_stack_depth():
     _E = (TypeError, KeyboardInterrupt)
 
@@ -100,7 +103,10 @@ def test_one_function_stack_depth():
     _log_execution_stacks(a, 4)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 12), reason="stack depth on 3.12+")
+@pytest.mark.skipif(
+    sys.version_info < (3, 12) or sys.version_info >= (3, 14),
+    reason="stack depths only in 3.12 & 3.13",
+)
 def test_stack_get():
     def to_be_traced(x):
         r = 8 - x

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/condition_parser.py

@@ -47,6 +47,7 @@ from crosshair.options import AnalysisKind
 from crosshair.register_contract import get_contract
 from crosshair.tracers import NoTracing
 from crosshair.util import (
+    CrossHairInternal,
     DynamicScopeVar,
     EvalFriendlyReprContext,
     IdKeyedDict,
@@ -485,6 +486,7 @@ class ConcreteConditionParser(ConditionParser):
             method = cls.__dict__.get(method_name, None)
             super_method_conditions = super_methods.get(method_name)
             if super_method_conditions is not None:
+                # Re-type the super's `self` argument to be this class:
                 revised_sig = set_first_arg_type(super_method_conditions.sig, cls)
                 super_method_conditions = replace(
                     super_method_conditions, sig=revised_sig
@@ -511,17 +513,15 @@ class ConcreteConditionParser(ConditionParser):
             final_pre = list(conditions.pre)
             final_post = list(conditions.post)
             if method_name in (
-                "__new__",  # isn't passed a concrete instance.
+                "__new__",  # a staticmethod, but not isinstance(staticmethod)
                 "__repr__",  # is itself required for reporting problems with invariants.
                 # [set/del]attr can do anything; we can't resonably enforce invariants:
                 "__setattr__",
                 "__delattr__",
+                "__replace__",  # Will raise an exception with most arbitrary **kwargs.
+                "__annotate__",  # a staticmethod, but not isinstance(staticmethod)
             ):
                 pass
-            elif method_name == "__replace__":
-                # TODO: remove this case when fixed in 3.13
-                # see https://github.com/python/cpython/issues/114198
-                pass
             elif method_name == "__del__":
                 final_pre.extend(inv)
             elif method_name == "__init__":

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/condition_parser_test.py

@@ -140,7 +140,7 @@ class TestPep316Parser:
             "self.x >= 0",
             "self.y >= 0",
         }
-        assert set(class_conditions.methods.keys()) == {"isready", "__init__"}
+        assert {"isready", "__init__"} <= set(class_conditions.methods.keys())
         method = class_conditions.methods["isready"]
         assert set([c.expr_source for c in method.pre]) == {
             "self.x >= 0",

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/copyext.py

@@ -1,4 +1,9 @@
-from copy import _deepcopy_atomic  # type: ignore
+import sys
+
+if sys.version_info >= (3, 14):
+    from copy import _atomic_types
+else:
+    from copy import _deepcopy_atomic  # type: ignore
 from copy import _deepcopy_dict  # type: ignore
 from copy import _deepcopy_dispatch  # type: ignore
 from copy import _deepcopy_list  # type: ignore
@@ -9,7 +14,7 @@ from copy import Error
 from copyreg import dispatch_table  # type: ignore
 from enum import Enum
 from types import MappingProxyType
-from typing import Any, Dict, Tuple
+from typing import Any, Callable, Dict, Tuple
 
 from crosshair.tracers import ResumedTracing
 from crosshair.util import (
@@ -85,17 +90,28 @@ def deepcopyext(obj: object, mode: CopyMode, memo: Dict) -> Any:
     return cpy
 
 
+if sys.version_info >= (3, 14):
+
+    def lookup_dispatch(cls: type) -> Callable:
+        if cls in _atomic_types:
+            return lambda obj, memo: obj
+        return _deepcopy_dispatch.get(cls)
+
+else:
+
+    def lookup_dispatch(cls: type) -> Callable:
+        return _deepcopy_dispatch.get(cls)
+
+
 def _deepconstruct(obj: object, mode: CopyMode, memo: Dict):
     cls = type(obj)
 
     def subdeepcopy(obj: object, memo: Dict):
         return deepcopyext(obj, mode, memo)
 
-    if cls in _deepcopy_dispatch:
-        creator = _deepcopy_dispatch[cls]
-        if creator is _deepcopy_atomic:
-            return obj
-        elif creator in (_deepcopy_dict, _deepcopy_list, _deepcopy_tuple):
+    creator = lookup_dispatch(cls)
+    if creator is not None:
+        if creator in (_deepcopy_dict, _deepcopy_list, _deepcopy_tuple):
             return creator(obj, memo, deepcopy=subdeepcopy)
         else:
             # TODO: We loose subdeepcopy in this case - won't

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/copyext_test.py

@@ -7,7 +7,7 @@ import pytest
 from crosshair.copyext import CopyMode, deepcopyext
 from crosshair.core_and_libs import proxy_for_type, standalone_statespace
 from crosshair.libimpl.builtinslib import SymbolicInt
-from crosshair.tracers import NoTracing, ResumedTracing
+from crosshair.tracers import NoTracing
 
 
 def test_deepcopyext_best_effort():
@@ -33,6 +33,16 @@ def test_deepcopyext_symbolic_set():
             deepcopyext(s, CopyMode.REALIZE, {})
 
 
+def test_deepcopyext_realize_simple(space):
+    x = SymbolicInt("x")
+    input = (x,)
+    output = deepcopyext(input, CopyMode.REALIZE, {})
+    assert input is not output
+    assert input[0] is not output[0]
+    assert type(input[0]) is SymbolicInt
+    assert type(output[0]) is int
+
+
 def test_deepcopyext_realize(space):
     x = SymbolicInt("x")
     lock = RLock()

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/dynamic_typing.py

@@ -4,7 +4,7 @@ from inspect import Parameter, Signature
 from itertools import zip_longest
 from typing import Any, Callable, Dict, List, Mapping, Optional, Sequence, Tuple, Type
 
-import typing_inspect
+import typing_inspect  # type: ignore
 
 from crosshair.util import debug  # type: ignore
 

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/fnutil_test.py

@@ -26,7 +26,10 @@ def test_fn_globals_on_builtin() -> None:
 
 def test_resolve_signature_invalid_annotations() -> None:
     sig = resolve_signature(with_invalid_type_annotation)
-    assert sig == "name 'TypeThatIsNotDefined' is not defined"
+    if sys.version_info >= (3, 14):
+        assert sig == "TypeThatIsNotDefined"
+    else:
+        assert sig == "name 'TypeThatIsNotDefined' is not defined"
 
 
 @pytest.mark.skipif(

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/libimpl/arraylib.py

@@ -30,19 +30,6 @@ INT_TYPE_BOUNDS: Dict[str, Tuple[int, int]] = {
 INT_TYPE_SIZE = {c: array(c).itemsize for c in INT_TYPE_BOUNDS.keys()}
 
 
-if sys.version_info >= (3, 12):
-    from collections.abc import Buffer
-
-    def is_bytes_like(obj: object) -> bool:
-        return isinstance(obj, Buffer)
-
-else:
-    from collections.abc import ByteString
-
-    def is_bytes_like(obj: object) -> bool:
-        return isinstance(obj, (ByteString, array))
-
-
 def pick_code(space: StateSpace) -> Tuple[str, int, int]:
     last_idx = len(INT_TYPE_BOUNDS) - 1
     for (idx, (code, rng)) in enumerate(INT_TYPE_BOUNDS.items()):

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/libimpl/builtinslib.py

@@ -17,7 +17,7 @@ from dataclasses import dataclass
 from itertools import zip_longest
 from math import inf, isfinite, isinf, isnan, nan
 from numbers import Integral, Number, Real
-from sys import maxunicode
+from sys import maxunicode, version_info
 from typing import (
     Any,
     BinaryIO,
@@ -58,6 +58,8 @@ try:
 except ImportError:
     from z3 import FfpEQ as fpEQ
 
+import sys
+
 from crosshair.abcstring import AbcString
 from crosshair.core import (
     SymbolicFactory,
@@ -116,6 +118,7 @@ from crosshair.util import (
     assert_tracing,
     ch_stack,
     debug,
+    is_bytes_like,
     is_hashable,
     is_iterable,
     memo,
@@ -1213,10 +1216,11 @@ class SymbolicInt(SymbolicIntable, AtomicSymbolicValue):
         cur_divisor = 10
         while True:
             leftover = self // cur_divisor
-            if leftover == 0:
+            if leftover != 0:
+                codepoints.append(48 + (leftover % 10))
+                cur_divisor *= 10
+            else:
                 break
-            codepoints.append(48 + (leftover % 10))
-            cur_divisor *= 10
         with NoTracing():
             codepoints.reverse()
             return LazyIntSymbolicStr(codepoints)
@@ -1316,7 +1320,7 @@ class SymbolicInt(SymbolicIntable, AtomicSymbolicValue):
                 z3.If(val < 128, 7, 8)))))))))
             # fmt: on
 
-    if sys.version_info >= (3, 12):
+    if version_info >= (3, 12):
 
         def is_integer(self):
             return True
@@ -2934,7 +2938,7 @@ class AnySymbolicStr(AbcString):
     def capitalize(self):
         if self.__len__() == 0:
             return ""
-        if sys.version_info >= (3, 8):
+        if version_info >= (3, 8):
             firstchar = self[0].title()
         else:
             firstchar = self[0].upper()
@@ -3172,7 +3176,7 @@ class AnySymbolicStr(AbcString):
         return ""
 
     def splitlines(self, keepends=False):
-        if sys.version_info < (3, 12):
+        if version_info < (3, 12):
             if not isinstance(keepends, int):
                 raise TypeError
         mylen = self.__len__()
@@ -3438,6 +3442,7 @@ class LazyIntSymbolicStr(AnySymbolicStr, CrossHairValue):
                 SliceView,
                 SequenceConcatenation,
                 list,  # TODO: are we sharing mutable state here?
+                tuple,
             ),
         ):
             self._codepoints = smtvar
@@ -3975,7 +3980,7 @@ class BytesLike(Buffer, AbcString, CrossHairValue):
             return False
         return list(self) == list(other)
 
-    if sys.version_info >= (3, 12):
+    if version_info >= (3, 12):
 
         def __buffer__(self, flags: int):
             with NoTracing():
@@ -4135,7 +4140,10 @@ class SymbolicBytes(BytesLike):
         accumulated = []
         high = None
         if not isinstance(hexstr, str):
-            raise TypeError
+            if is_bytes_like(hexstr) and version_info >= (3, 14):
+                hexstr = LazyIntSymbolicStr(tuple(hexstr))
+            else:
+                raise TypeError
         for idx, ch in enumerate(hexstr):
             if not ch.isascii():
                 raise ValueError(
@@ -4894,7 +4902,7 @@ def _int_from_bytes(
 ) -> int:
     if byteorder is _MISSING:
         # byteorder defaults to "big" as of 3.11
-        if sys.version_info >= (3, 11):
+        if version_info >= (3, 11):
             byteorder = "big"
         else:
             raise TypeError
@@ -5108,7 +5116,7 @@ def make_registrations():
 
     register_type(Union, make_union_choice)
 
-    if sys.version_info >= (3, 8):
+    if version_info >= (3, 8):
         from typing import Final
 
         register_type(Final, lambda p, t: p(t))
@@ -5266,7 +5274,7 @@ def make_registrations():
         "upper",
         "zfill",
     ]
-    if sys.version_info >= (3, 9):
+    if version_info >= (3, 9):
         names_to_str_patch.append("removeprefix")
         names_to_str_patch.append("removesuffix")
     for name in names_to_str_patch:
@@ -5322,12 +5330,12 @@ def make_registrations():
     # Patches on int
     register_patch(int.__repr__, with_checked_self(int, "__repr__"))
     register_patch(int.as_integer_ratio, with_checked_self(int, "as_integer_ratio"))
-    if sys.version_info >= (3, 10):
+    if version_info >= (3, 10):
         register_patch(int.bit_count, with_checked_self(int, "bit_count"))
     register_patch(int.bit_length, with_checked_self(int, "bit_length"))
     register_patch(int.conjugate, with_checked_self(int, "conjugate"))
     register_patch(int.from_bytes, _int_from_bytes)
-    if sys.version_info >= (3, 12):
+    if version_info >= (3, 12):
         register_patch(int.is_integer, with_checked_self(int, "is_integer"))
     register_patch(int.to_bytes, with_checked_self(int, "to_bytes"))
 

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/libimpl/collectionslib.py

@@ -126,8 +126,19 @@ class ListBasedDeque(collections.abc.MutableSequence, CrossHairValue, Generic[T]
         prefix.reverse()
         self._contents = prefix + self._contents
 
-    def index(self, item: T, *bounds) -> int:
-        return self._contents.index(item, *bounds)
+    if sys.version_info >= (3, 14):
+
+        def index(self, item: T, *bounds) -> int:
+            try:
+                return self._contents.index(item, *bounds)
+            except ValueError as exc:
+                exc.args = ("deque.index(x): x not in deque",)
+                raise
+
+    else:
+
+        def index(self, item: T, *bounds) -> int:
+            return self._contents.index(item, *bounds)
 
     def insert(self, index: int, item: T) -> None:
         self._contents.insert(index, item)

{crosshair-tool-0.0.84 → crosshair-tool-0.0.85}/crosshair/libimpl/collectionslib_test.py

@@ -1,3 +1,4 @@
+import re
 import sys
 from collections import Counter, defaultdict, deque, namedtuple
 from copy import deepcopy
@@ -98,7 +99,11 @@ def test_deque_index_with_start_index_throws_correct_exception(test_list) -> Non
     with pytest.raises(ValueError) as context:
         test_list.index(1, 2)
 
-    assert context.match("1 is not in list")
+    if sys.version_info >= (3, 14):
+        # assert context.match(re.escape("list.index(x): x not in list"))
+        assert context.match(re.escape("deque.index(x): x not in deque"))
+    else:
+        assert context.match("1 is not in list")
 
 
 def test_deque_index_with_start_and_end_index(test_list) -> None:
@@ -112,7 +117,10 @@ def test_deque_index_with_start_and_end_index_throws_correct_exception(
     with pytest.raises(ValueError) as context:
         test_list.index(6, 0, 1)
 
-    assert context.match("6 is not in list")
+    if sys.version_info >= (3, 14):
+        assert context.match(re.escape("deque.index(x): x not in deque"))
+    else:
+        assert context.match("6 is not in list")
 
 
 def test_deque_insert(test_list) -> None: