Remove cherry-pick artifacts (testStrMultiply, testConstantFoldFormatArgs, CPyStr_Multiply)

Author: VaggelisD

mypy/version.py

@@ -8,7 +8,7 @@
 # - Release versions have the form "1.2.3".
 # - Dev versions have the form "1.2.3+dev" (PLUS sign to conform to PEP 440).
 # - Before 1.0 we had the form "0.NNN".
-__version__ = "1.19.1"
+__version__ = "1.19.1.post1"
 base_version = __version__
 
 mypy_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))

mypyc/irbuild/builder.py

@@ -1399,7 +1399,7 @@ def add_var_to_env_class(
         if always_defined:
             self.fn_info.env_class.attrs_with_defaults.add(name)
         if base._curr_env_reg is None:
-            return
+            return None  # type: ignore[return-value]
         attr_target = AssignmentTargetAttr(base.curr_env_reg, name)
 
         if reassign:

mypyc/lib-rt/CPy.h

@@ -770,7 +770,6 @@ PyObject *CPy_Encode(PyObject *obj, PyObject *encoding, PyObject *errors);
 Py_ssize_t CPyStr_Count(PyObject *unicode, PyObject *substring, CPyTagged start);
 Py_ssize_t CPyStr_CountFull(PyObject *unicode, PyObject *substring, CPyTagged start, CPyTagged end);
 CPyTagged CPyStr_Ord(PyObject *obj);
-PyObject *CPyStr_Multiply(PyObject *str, CPyTagged count);
 PyObject *CPyStr_Lower(PyObject *str);
 PyObject *CPyStr_Upper(PyObject *str);
 bool CPyStr_IsSpace(PyObject *str);

mypyc/lib-rt/str_ops.c

@@ -622,15 +622,6 @@ CPyTagged CPyStr_Ord(PyObject *obj) {
     return CPY_INT_TAG;
 }
 
-PyObject *CPyStr_Multiply(PyObject *str, CPyTagged count) {
-    Py_ssize_t temp_count = CPyTagged_AsSsize_t(count);
-    if (temp_count == -1 && PyErr_Occurred()) {
-        PyErr_SetString(PyExc_OverflowError, CPYTHON_LARGE_INT_ERRMSG);
-        return NULL;
-    }
-    return PySequence_Repeat(str, temp_count);
-}
-
 
 bool CPyStr_IsSpace(PyObject *str) {
     Py_ssize_t len = PyUnicode_GET_LENGTH(str);

mypyc/test-data/irbuild-str.test

@@ -772,27 +772,6 @@ L0:
     r1 = 'literal'
     return 1
 
-[case testStrMultiply]
-def s_times_i(s: str, n: int) -> str:
-    return s * n
-def i_times_s(s: str, n: int) -> str:
-    return n * s
-[out]
-def s_times_i(s, n):
-    s :: str
-    n :: int
-    r0 :: str
-L0:
-    r0 = CPyStr_Multiply(s, n)
-    return r0
-def i_times_s(s, n):
-    s :: str
-    n :: int
-    r0 :: str
-L0:
-    r0 = CPyStr_Multiply(s, n)
-    return r0
-
 [case testStrLower]
 def do_lower(s: str) -> str:
     return s.lower()

mypyc/test-data/run-strings.test

@@ -1104,14 +1104,6 @@ def test_optional_ne() -> None:
     assert ne_s_opt_s_opt(None, 'x')
     assert ne_s_opt_s_opt('x', None)
 
-[case testConstantFoldFormatArgs]
-from typing import Final
-
-FMT: Final = "{} {}"
-
-def test_format() -> None:
-    assert FMT.format(400 + 20, "roll" + "up") == "420 rollup"
-
 [case testLowerAndUpper]
 from typing import Any