Merge branch 'main' into fix-issue-134759

skv0zsneg · skv0zsneg · commit 771288dfd6b3 · 2025-06-28T14:04:28.000+03:00
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
@@ -986,7 +986,7 @@ def _error_message():
 
 
     def assert_called_once_with(self, /, *args, **kwargs):
-        """assert that the mock was called exactly once and that that call was
+        """assert that the mock was called exactly once and that call was
         with the specified arguments."""
         if not self.call_count == 1:
             msg = ("Expected '%s' to be called once. Called %s times.%s"
diff --git a/Python/optimizer_symbols.c b/Python/optimizer_symbols.c
@@ -212,7 +212,7 @@ _Py_uop_sym_is_safe_const(JitOptContext *ctx, JitOptRef sym)
     PyTypeObject *typ = Py_TYPE(const_val);
     return (typ == &PyUnicode_Type) ||
            (typ == &PyFloat_Type) ||
-           (typ == &PyTuple_Type) ||
+           (typ == &_PyNone_Type) ||
            (typ == &PyBool_Type);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ _Py_uop_sym_is_safe_const(JitOptContext *ctx, JitOptRef sym)`
`212`	`212`	`PyTypeObject *typ = Py_TYPE(const_val);`
`213`	`213`	`return (typ == &PyUnicode_Type) \|\|`
`214`	`214`	`(typ == &PyFloat_Type) \|\|`
`215`		`- (typ == &PyTuple_Type) \|\|`
	`215`	`+ (typ == &_PyNone_Type) \|\|`
`216`	`216`	`(typ == &PyBool_Type);`
`217`	`217`	`}`
`218`	`218`