crosshair-tool 0.0.96__tar.gz → 0.0.97__tar.gz

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.96
+Version: 0.0.97
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely
@@ -8,7 +8,6 @@ Author-email: pschanely+vE7F@gmail.com
 License: MIT
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
@@ -32,14 +31,14 @@ Requires-Dist: pygls>=1.0.0
 Requires-Dist: typeshed-client>=2.0.5
 Provides-Extra: dev
 Requires-Dist: autodocsumm<1,>=0.2.2; extra == "dev"
-Requires-Dist: black==22.3.0; extra == "dev"
+Requires-Dist: black==25.9.0; extra == "dev"
 Requires-Dist: deal>=4.13.0; extra == "dev"
 Requires-Dist: icontract>=2.4.0; extra == "dev"
 Requires-Dist: isort==5.11.5; extra == "dev"
-Requires-Dist: mypy==0.990; extra == "dev"
+Requires-Dist: mypy==1.18.1; extra == "dev"
 Requires-Dist: numpy==1.23.4; python_version < "3.12" and extra == "dev"
 Requires-Dist: numpy==1.26.0; (python_version >= "3.12" and python_version < "3.13") and extra == "dev"
-Requires-Dist: numpy==2.0.1; python_version >= "3.13" and extra == "dev"
+Requires-Dist: numpy==2.3.3; python_version >= "3.13" and extra == "dev"
 Requires-Dist: pre-commit~=2.20; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/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.96"  # Do not forget to update in setup.py!
+__version__ = "0.0.97"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/_tracers.c

@@ -37,6 +37,12 @@
 #include "internal/pycore_frame.h"
 #endif
 
+#if PY_VERSION_HEX >= 0x030E0000
+// Python 3.14+
+#include "internal/pycore_interpframe_structs.h"
+#include "internal/pycore_stackref.h"
+#endif
+
 
 #if PY_VERSION_HEX >= 0x030C0000
 // Python 3.12+
@@ -60,6 +66,7 @@ const uint8_t _ch_TRACABLE_INSTRUCTIONS[256] = {
     // == 3.14
     [CALL_KW] = 1,
     [CONVERT_VALUE] = 1,
+    [LOAD_COMMON_CONSTANT] = 1,
 #endif
     [UNARY_NOT] = 1,
     [SET_ADD] = 1,
@@ -352,7 +359,7 @@ if (!self->trace_all_opcodes) {
 #elif PY_VERSION_HEX >= 0x030E0000
 // Python 3.14+
     if (!self->trace_all_opcodes) {
-        PyBytesObject *code_bytes = PyCode_GetCode(pCode);
+        PyBytesObject *code_bytes = (PyBytesObject *)PyCode_GetCode(pCode);
         int opcode = code_bytes->ob_sval[lasti];
         int last_opcode = 255;
         uint8_t at_enabled_position = _ch_TRACABLE_INSTRUCTIONS[opcode];
@@ -932,16 +939,12 @@ TraceSwapType = {
 
 #define MODULE_DOC PyDoc_STR("CrossHair's intercepting tracer.")
 
-
-
-static PyObject **crosshair_tracers_stack_lookup(PyFrameObject *frame, int index) {
 #if PY_VERSION_HEX >= 0x030E0000
-    // Python 3.14+
-    PyCodeObject* code = _PyFrame_GetCodeBorrow(frame);
-    _PyInterpreterFrame* interpreterFrame = frame->f_frame;
-    return &(interpreterFrame->stackpointer[index]);
+// Python 3.14+
+// (does not use the crosshair_tracers_stack_lookup() helper)
 #elif PY_VERSION_HEX >= 0x030C0000
-    // Python 3.12
+// Python 3.12
+static PyObject **crosshair_tracers_stack_lookup(PyFrameObject *frame, int index) {
     PyCodeObject* code = _PyFrame_GetCodeBorrow(frame);
     _PyInterpreterFrame* interpreterFrame = frame->f_frame;
     int64_t *stacks = _ch_get_stacks(code);
@@ -952,21 +955,63 @@ static PyObject **crosshair_tracers_stack_lookup(PyFrameObject *frame, int index
     }
     int stacktop = stack_contents >> 1;
     return &(interpreterFrame->localsplus[code->co_nlocalsplus + stacktop + index]);
-    // PyObject* ret = interpreterFrame->localsplus[stacktop + index];
+}
 #elif PY_VERSION_HEX >= 0x030B0000
-    // Python 3.11
+// Python 3.11
+static PyObject **crosshair_tracers_stack_lookup(PyFrameObject *frame, int index) {
     _PyInterpreterFrame* interpreterFrame = frame->f_frame;
     int stacktop = interpreterFrame->stacktop;
     return &(interpreterFrame->localsplus[stacktop + index]);
+}
 #elif PY_VERSION_HEX >= 0x030A0000
-    // Python 3.10
+// Python 3.10
+static PyObject **crosshair_tracers_stack_lookup(PyFrameObject *frame, int index) {
     return &(frame->f_valuestack[frame->f_stackdepth + index]);
+}
 #else
-    // Python 3.8, 3.9
+// Python 3.8, 3.9
+static PyObject **crosshair_tracers_stack_lookup(PyFrameObject *frame, int index) {
     return &(frame->f_stacktop[index]);
+}
 #endif
+
+#if PY_VERSION_HEX >= 0x030E0000
+// Python 3.14+
+static PyObject *crosshair_tracers_stack_read(PyObject *self, PyObject *args)
+{
+    PyFrameObject *frame;
+    int index;
+    if (!PyArg_ParseTuple(args, "Oi", &frame, &index)) {
+        return NULL;
+    }
+
+    _PyInterpreterFrame* interpreterFrame = frame->f_frame;
+    if (PyStackRef_IsNull(interpreterFrame->stackpointer[index])) {
+        PyErr_SetString(PyExc_ValueError, "No stack value is present");
+        return NULL;
+    } else {
+        return PyStackRef_AsPyObjectNew(interpreterFrame->stackpointer[index]);
+    }
 }
 
+static PyObject* crosshair_tracers_stack_write(PyObject *self, PyObject *args)
+{
+    PyFrameObject *frame;
+    PyObject *val;
+    int index;
+    if (!PyArg_ParseTuple(args, "OiO", &frame, &index, &val)) {
+        return NULL;
+    }
+    _PyInterpreterFrame* interpreterFrame = frame->f_frame;
+    if (! PyStackRef_IsNull(interpreterFrame->stackpointer[index])) {
+        PyStackRef_CLEAR(interpreterFrame->stackpointer[index]);
+    }
+    interpreterFrame->stackpointer[index] = PyStackRef_FromPyObjectNew(val);
+    Py_RETURN_NONE;
+}
+
+#else
+
 static PyObject *crosshair_tracers_stack_read(PyObject *self, PyObject *args)
 {
     PyFrameObject *frame;
@@ -988,7 +1033,6 @@ static PyObject *crosshair_tracers_stack_read(PyObject *self, PyObject *args)
         return ret;
     }
 }
-
 static PyObject* crosshair_tracers_stack_write(PyObject *self, PyObject *args)
 {
     PyFrameObject *frame;
@@ -1009,6 +1053,8 @@ static PyObject* crosshair_tracers_stack_write(PyObject *self, PyObject *args)
     *stackval = val;
     Py_RETURN_NONE;
 }
+#endif
+
 
 static PyObject* crosshair_tracers_code_stack_depths(PyObject *self, PyObject *args)
 {

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/_tracers_test.py

@@ -19,19 +19,19 @@ class ExampleModule:
 
 def test_CTracer_module_refcounts_dont_leak():
     mod = ExampleModule()
-    assert sys.getrefcount(mod) == 2
+    base_count = sys.getrefcount(mod)
     tracer = CTracer()
     tracer.push_module(mod)
-    assert sys.getrefcount(mod) == 3
+    assert sys.getrefcount(mod) == base_count + 1
     tracer.push_module(mod)
     tracer.start()
     tracer.stop()
-    assert sys.getrefcount(mod) == 4
+    assert sys.getrefcount(mod) == base_count + 2
     tracer.pop_module(mod)
-    assert sys.getrefcount(mod) == 3
+    assert sys.getrefcount(mod) == base_count + 1
     del tracer
     gc.collect()
-    assert sys.getrefcount(mod) == 2
+    assert sys.getrefcount(mod) == base_count
 
 
 def _get_depths(fn):

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/codeconfig.py

@@ -1,4 +1,5 @@
 """Configure analysis options at different levels."""
+
 import importlib.resources
 import inspect
 import re
@@ -25,7 +26,7 @@ def get_directives(source_text: str) -> Iterable[Tuple[int, int, str]]:
     ret = []
     tokens = tokenize.generate_tokens(StringIO(source_text).readline)
     # TODO catch tokenize.TokenError ... just in case?
-    for (toktyp, tokval, begin, _, _) in tokens:
+    for toktyp, tokval, begin, _, _ in tokens:
         linenum, colnum = begin
         if toktyp == tokenize.COMMENT:
             directive = _COMMENT_TOKEN_RE.sub(r"\1", tokval)
@@ -39,7 +40,7 @@ class InvalidDirective(Exception):
 
 
 def parse_directives(
-    directive_lines: Iterable[Tuple[int, int, str]]
+    directive_lines: Iterable[Tuple[int, int, str]],
 ) -> AnalysisOptionSet:
     """
     Parse options from directives in comments.

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/condition_parser.py

@@ -520,6 +520,7 @@ class ConcreteConditionParser(ConditionParser):
                 "__delattr__",
                 "__replace__",  # Will raise an exception with most arbitrary **kwargs.
                 "__annotate__",  # a staticmethod, but not isinstance(staticmethod)
+                "__annotate_func__",
             ):
                 pass
             elif method_name == "__del__":

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/core.py

@@ -563,12 +563,12 @@ class SymbolicFactory:
     @overload
     def __call__(
         self, typ: Callable[..., _T], suffix: str = "", allow_subtypes: bool = True
-    ) -> _T:
-        ...
+    ) -> _T: ...
 
     @overload
-    def __call__(self, typ: Any, suffix: str = "", allow_subtypes: bool = True) -> Any:
-        ...
+    def __call__(
+        self, typ: Any, suffix: str = "", allow_subtypes: bool = True
+    ) -> Any: ...
 
     def __call__(self, typ, suffix: str = "", allow_subtypes: bool = True):
         """
@@ -653,8 +653,7 @@ def proxy_for_type(
     typ: Callable[..., _T],
     varname: str,
     allow_subtypes: bool = False,
-) -> _T:
-    ...
+) -> _T: ...
 
 
 @overload
@@ -662,8 +661,7 @@ def proxy_for_type(
     typ: Any,
     varname: str,
     allow_subtypes: bool = False,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 def proxy_for_type(

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/dynamic_typing.py

@@ -59,7 +59,7 @@ def unify_callable_args(
         return True
     if len(value_types) != len(recv_types):
         return False
-    for (varg, rarg) in zip(value_types, recv_types):
+    for varg, rarg in zip(value_types, recv_types):
         # note reversal here: Callable is contravariant in argument types
         if not unify(rarg, varg, bindings):
             return False
@@ -206,7 +206,7 @@ def unify(
                 vargs = [object for _ in rargs]
             else:
                 return False
-        for (varg, targ) in zip(vargs, rargs):
+        for varg, targ in zip(vargs, rargs):
             if not unify(varg, targ, bindings):
                 return False
         return True
@@ -302,7 +302,7 @@ def intersect_signatures(
     is_squishy1 = var_pos1 is not None or var_key1 is not None
     is_squishy2 = var_pos2 is not None or var_key2 is not None
     out_params: Dict[str, Parameter] = {}
-    for (p1, p2) in zip_longest(pos1, pos2):
+    for p1, p2 in zip_longest(pos1, pos2):
         if p1 is None:
             if is_squishy1:
                 out_params[p2.name] = p2

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/enforce.py

@@ -36,6 +36,7 @@ def WithEnforcement(fn: Callable) -> Callable:
     Enforcement is normally disabled when calling from some internal files, for
     performance reasons. Use WithEnforcement to ensure it is enabled anywhere.
     """
+
     # This local function has a special name that we look for while tracing
     # (see the wants_codeobj method below):
     def _crosshair_with_enforcement(*a, **kw):

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/examples/check_examples_test.py

@@ -1,4 +1,5 @@
 """Run functional tests of the tool on all the examples."""
+
 import argparse
 import os
 import pathlib

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/fnutil.py

@@ -41,8 +41,7 @@ if sys.version_info >= (3, 8):
     from typing import Protocol
 
     class Descriptor(Protocol):
-        def __get__(self, instance: object, cls: type) -> Any:
-            ...
+        def __get__(self, instance: object, cls: type) -> Any: ...
 
 else:
     Descriptor = Any
@@ -344,7 +343,7 @@ def walk_paths(paths: Iterable[Path], ignore_missing=False) -> Iterable[Path]:
             else:
                 raise FileNotFoundError(str(path))
         if path.is_dir():
-            for (dirpath, _dirs, files) in os.walk(str(path)):
+            for dirpath, _dirs, files in os.walk(str(path)):
                 for curfile in files:
                     if analyzable_filename(curfile):
                         yield Path(dirpath) / curfile

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/fnutil_test.py

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

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/fuzz_core_test.py

@@ -47,7 +47,7 @@ from crosshair.statespace import (
 from crosshair.stubs_parser import signature_from_stubs
 from crosshair.test_util import flexible_equal
 from crosshair.tracers import COMPOSITE_TRACER, NoTracing, ResumedTracing
-from crosshair.util import CrosshairUnsupported, debug, type_args_of
+from crosshair.util import CrosshairUnsupported, debug, is_iterable, type_args_of
 
 FUZZ_SEED = 1348
 
@@ -267,6 +267,14 @@ class FuzzTester:
         ) -> object:
             for name in typed_args.keys():
                 literal, symbolic = literal_args[name], symbolic_args[name]
+                with NoTracing():
+                    # TODO: transition into general purpose SMT expr extractor
+                    # for equality with constant
+                    if hasattr(symbolic, "_smt_promote_literal"):
+                        symbolic.var = symbolic._smt_promote_literal(literal)  # type: ignore
+                    elif is_iterable(literal) and is_iterable(symbolic):
+                        with ResumedTracing():
+                            space.add(len(literal) == len(symbolic))  # type: ignore
                 if literal != symbolic:
                     raise IgnoreAttempt(
                         f'symbolic "{name}" not equal to literal "{name}"'

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/libimpl/arraylib.py

@@ -32,7 +32,7 @@ INT_TYPE_SIZE = {c: array(c).itemsize for c in INT_TYPE_BOUNDS.keys()}
 
 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()):
+    for idx, (code, rng) in enumerate(INT_TYPE_BOUNDS.items()):
         if idx < last_idx:
             if space.smt_fork(desc=f"not_{code}_array"):
                 continue

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/libimpl/builtinslib.py

@@ -189,6 +189,7 @@ def smt_not(x: object) -> Union[bool, "SymbolicBool"]:
 
 _NONHEAP_PYTYPES = set([int, float, bool, NoneType, complex])
 
+
 # TODO: isn't this pretty close to isinstance(typ, AtomicSymbolicValue)?
 def pytype_uses_heap(typ: Type) -> bool:
     return not (typ in _NONHEAP_PYTYPES)
@@ -900,6 +901,7 @@ def setup_binops():
                 if isinstance(a, FiniteFloat)
                 else a.var
             )
+            assert smt_a is not None
             if isinstance(b, NonFiniteFloat):
                 if isnan(b.val):
                     return (nan, nan)
@@ -912,6 +914,7 @@ def setup_binops():
                     return (-1.0, b.val)
                 else:
                     return (0.0, a.val if isinstance(a, FiniteFloat) else a)
+            assert smt_b is not None
 
             remainder = z3.Real(f"remainder{space.uniq()}")
             modproduct = z3.Int(f"modproduct{space.uniq()}")
@@ -1591,6 +1594,7 @@ class RealBasedSymbolicFloat(SymbolicFloat):
             denominator = SymbolicInt("denominator" + space.uniq())
             space.add(denominator.var > 0)
             space.add(numerator.var == denominator.var * self.var)
+
         # There are many valid integer ratios to return. Experimentally, both
         # z3 and CPython tend to pick the same ones. But verify this, while
         # deferring materialization:
@@ -2330,7 +2334,7 @@ class SymbolicRange:
             return False
         if len(self) != len(other):
             return False
-        for (v1, v2) in zip(self, other):
+        for v1, v2 in zip(self, other):
             if v1 != v2:
                 return False
         return True
@@ -2783,7 +2787,7 @@ class SymbolicBoundedIntTuple(collections.abc.Sequence):
         with NoTracing():
             self._create_up_to(realize(otherlen))
             constraints = []
-            for (int1, int2) in zip(self._created_vars, tracing_iter(other)):
+            for int1, int2 in zip(self._created_vars, tracing_iter(other)):
                 smtint2 = force_to_smt_sort(int2, SymbolicInt)
                 constraints.append(int1.var == smtint2)
             return SymbolicBool(z3.And(*constraints))
@@ -2910,7 +2914,7 @@ class AnySymbolicStr(AbcString):
             raise TypeError
         if self == other:
             return True if op in (ops.le, ops.ge) else False
-        for (mych, otherch) in zip_longest(iter(self), iter(other)):
+        for mych, otherch in zip_longest(iter(self), iter(other)):
             if mych == otherch:
                 continue
             if mych is None:
@@ -3172,7 +3176,7 @@ class AnySymbolicStr(AbcString):
 
         else:
             raise TypeError
-        for (idx, ch) in enumerate(self):
+        for idx, ch in enumerate(self):
             if not filter(ch):
                 return self[idx:]
         return ""
@@ -3184,7 +3188,7 @@ class AnySymbolicStr(AbcString):
         mylen = self.__len__()
         if mylen == 0:
             return []
-        for (idx, ch) in enumerate(self):
+        for idx, ch in enumerate(self):
             codepoint = ord(ch)
             with NoTracing():
                 space = context_statespace()
@@ -4008,7 +4012,7 @@ class SymbolicByteArray(BytesLike, ShellMutableSequence):  # type: ignore
 
 
 class SymbolicMemoryView(BytesLike):
-    format = "B"
+    format = "B"  # type: ignore
     itemsize = 1
     ndim = 1
     strides = (1,)
@@ -4817,11 +4821,11 @@ def _str_percent_format(self, other):
     return self.__mod__(deep_realize(other))
 
 
-def _bytes_join(self, itr) -> str:
+def _bytes_join(self, itr) -> bytes:
     return _join(self, itr, self_type=bytes, item_type=Buffer)
 
 
-def _bytearray_join(self, itr) -> str:
+def _bytearray_join(self, itr) -> bytes:
     return _join(self, itr, self_type=bytearray, item_type=Buffer)
 
 

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/libimpl/builtinslib_ch_test.py

@@ -178,7 +178,7 @@ def check_iter(obj: Union[str, List[int], Dict[int, int]]) -> ResultComparison:
 
 
 def check_len(
-    s: Union[Dict[int, int], Tuple[int, ...], str, List[int], Set[int]]
+    s: Union[Dict[int, int], Tuple[int, ...], str, List[int], Set[int]],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(len, s)
@@ -984,7 +984,7 @@ def check_bytes___init__(source: Union[int, List[int], bytes, bytearray, memoryv
 
 
 def check_bytearray___init__(
-    source: Union[int, List[int], bytes, bytearray, memoryview]
+    source: Union[int, List[int], bytes, bytearray, memoryview],
 ):
     """
     post: _
@@ -994,7 +994,7 @@ def check_bytearray___init__(
 
 
 def check_memoryview___init__(
-    source: Union[int, List[int], bytes, bytearray, memoryview]
+    source: Union[int, List[int], bytes, bytearray, memoryview],
 ):
     """
     post: _

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/libimpl/builtinslib_test.py

@@ -1450,7 +1450,7 @@ def test_str_lower():
 
 
 def test_str_title():
-    chr_lj = "\u01C9"  # "lj"
+    chr_lj = "\u01c9"  # "lj"
     chr_Lj = "\u01c8"  # "Lj" (different from "LJ", "\u01c7")
     with standalone_statespace:
         with NoTracing():
@@ -2649,6 +2649,7 @@ if sys.version_info >= (3, 9):
 def test_set_basic_fail() -> None:
     def f(a: Set[int], k: int) -> None:
         """
+        pre: len(a) <= 2
         post[a]: k+1 in a
         """
         a.add(k)

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/libimpl/datetimelib.py

@@ -627,9 +627,7 @@ class timedelta:
 
     def total_seconds(self):
         """Total seconds in the duration."""
-        return (
-            (self.days * 86400 + self.seconds) * 10**6 + self.microseconds
-        ) / 10**6
+        return ((self.days * 86400 + self.seconds) * 10**6 + self.microseconds) / 10**6
 
     # Read-only field accessors
     @property

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/libimpl/datetimelib_ch_test.py

@@ -29,7 +29,7 @@ def check_datetimelib_lt(
         Tuple[timedelta, timedelta],
         Tuple[date, datetime],
         Tuple[datetime, datetime],
-    ]
+    ],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(operator.lt, *p)
@@ -40,7 +40,7 @@ def check_datetimelib_add(
         Tuple[timedelta, timedelta],
         Tuple[date, timedelta],
         Tuple[timedelta, datetime],
-    ]
+    ],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(operator.add, *p)
@@ -52,14 +52,14 @@ def check_datetimelib_subtract(
         Tuple[date, timedelta],
         Tuple[datetime, timedelta],
         Tuple[datetime, datetime],
-    ]
+    ],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(operator.sub, *p)
 
 
 def check_datetimelib_str(
-    obj: Union[timedelta, timezone, date, time, datetime]
+    obj: Union[timedelta, timezone, date, time, datetime],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(_invoker("__str__"), obj)
@@ -67,7 +67,7 @@ def check_datetimelib_str(
 
 def check_datetimelib_repr(
     # TODO: re-enable time, datetime repr checking after fixing in Python 3.11
-    obj: Union[timedelta, timezone, date]
+    obj: Union[timedelta, timezone, date],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(_invoker("__repr__"), obj)

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/libimpl/encodings/_encutil.py

@@ -25,6 +25,7 @@ class UnexpectedEndError(ChunkError):
 @dataclass
 class MidChunkError(ChunkError):
     _reason: str
+
     # _errlen: int = 1
     def reason(self) -> str:
         return self._reason
@@ -112,7 +113,7 @@ class StemEncoder:
                     continue
                 if errors == "replace":
                     idx += 1
-                    parts.append("\uFFFD")
+                    parts.append("\ufffd")
                     continue
 
                 # 2. Then fall back to native implementations if necessary:
@@ -132,24 +133,28 @@ class StemEncoder:
 
 def _getregentry(stem_encoder: Type[StemEncoder]):
     class StemIncrementalEncoder(codecs.BufferedIncrementalEncoder):
-        def _buffer_encode(self, input: str, errors: str, final: bool) -> bytes:
+        def _buffer_encode(
+            self, input: str, errors: str, final: bool
+        ) -> Tuple[bytes, int]:
             enc_name = stem_encoder.encoding_name
             out, idx, err = stem_encoder._encode_chunk(input, 0)
             assert isinstance(out, bytes)
             if not err:
-                return out
+                return (out, idx)
             if isinstance(err, UnexpectedEndError) or not final:
-                return out
+                return (out, idx)
             exc = UnicodeEncodeError(enc_name, input, idx, idx + 1, err.reason())
             replacement, idx = codecs.lookup_error(errors)(exc)
             if isinstance(replacement, str):
                 replacement = codecs.encode(replacement, enc_name)
-            return out + replacement
+            return (out + replacement, idx)
 
     class StemIncrementalDecoder(codecs.BufferedIncrementalDecoder):
         def _buffer_decode(
-            self, input: bytes, errors: str, final: bool
+            self, input: Buffer, errors: str, final: bool
         ) -> Tuple[str, int]:
+            if not isinstance(input, bytes):
+                input = memoryview(input).tobytes()
             enc_name = stem_encoder.encoding_name
             out, idx, err = stem_encoder._decode_chunk(input, 0)
             assert isinstance(out, str)

{crosshair_tool-0.0.96 → crosshair_tool-0.0.97}/crosshair/libimpl/relib.py

@@ -7,7 +7,7 @@ from unicodedata import category
 if sys.version_info < (3, 11):
     import sre_parse as re_parser
 else:
-    import re._parser as re_parser
+    import re._parser as re_parser  # type: ignore
 
 from sys import maxunicode
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union, cast