Sync mypy: base64 is non-experimental now

Author: ilevkivskyi

lib-rt/CPy.h

@@ -149,6 +149,9 @@ CPyTagged CPyTagged_BitwiseLongOp_(CPyTagged a, CPyTagged b, char op);
 CPyTagged CPyTagged_Rshift_(CPyTagged left, CPyTagged right);
 CPyTagged CPyTagged_Lshift_(CPyTagged left, CPyTagged right);
 CPyTagged CPyTagged_BitLength(CPyTagged self);
+PyObject *CPyTagged_ToBytes(CPyTagged self, Py_ssize_t length, PyObject *byteorder, int signed_flag);
+PyObject *CPyTagged_ToBigEndianBytes(CPyTagged self, Py_ssize_t length, int signed_flag);
+PyObject *CPyTagged_ToLittleEndianBytes(CPyTagged self, Py_ssize_t length, int signed_flag);
 
 PyObject *CPyTagged_Str(CPyTagged n);
 CPyTagged CPyTagged_FromFloat(double f);
@@ -605,8 +608,8 @@ static void CPy_DecRef(PyObject *p) {
 }
 
 CPy_NOINLINE
-static void CPy_XDecRef(PyObject *p) {
-    CPy_XDECREF(p);
+static void CPy_XDecRef(void *p) {
+    CPy_XDECREF((PyObject *)p);
 }
 
 static inline CPyTagged CPyObject_Size(PyObject *obj) {
@@ -790,7 +793,7 @@ PyObject *CPyBytes_Join(PyObject *sep, PyObject *iter);
 CPyTagged CPyBytes_Ord(PyObject *obj);
 PyObject *CPyBytes_Multiply(PyObject *bytes, CPyTagged count);
 int CPyBytes_Startswith(PyObject *self, PyObject *subobj);
-
+int CPyBytes_Endswith(PyObject *self, PyObject *subobj);
 int CPyBytes_Compare(PyObject *left, PyObject *right);
 
 

lib-rt/librt_base64.c lib-rt/base64/librt_base64.clib-rt/librt_base64.c renamed to lib-rt/base64/librt_base64.c

@@ -5,8 +5,6 @@
 #include "libbase64.h"
 #include "pythoncapi_compat.h"
 
-#ifdef MYPYC_EXPERIMENTAL
-
 static PyObject *
 b64decode_handle_invalid_input(
     PyObject *out_bytes, char *outbuf, size_t max_out, const char *src, size_t srclen, bool freesrc);
@@ -327,20 +325,14 @@ urlsafe_b64decode(PyObject *self, PyObject *const *args, size_t nargs) {
     return b64decode_internal(args[0], true);
 }
 
-#endif
-
 static PyMethodDef librt_base64_module_methods[] = {
-#ifdef MYPYC_EXPERIMENTAL
     {"b64encode", (PyCFunction)b64encode, METH_FASTCALL, PyDoc_STR("Encode bytes object using Base64.")},
     {"b64decode", (PyCFunction)b64decode, METH_FASTCALL, PyDoc_STR("Decode a Base64 encoded bytes object or ASCII string.")},
     {"urlsafe_b64encode", (PyCFunction)urlsafe_b64encode, METH_FASTCALL, PyDoc_STR("Encode bytes object using URL and file system safe Base64 alphabet.")},
     {"urlsafe_b64decode", (PyCFunction)urlsafe_b64decode, METH_FASTCALL, PyDoc_STR("Decode bytes or ASCII string using URL and file system safe Base64 alphabet.")},
-#endif
     {NULL, NULL, 0, NULL}
 };
 
-#ifdef MYPYC_EXPERIMENTAL
-
 static int
 base64_abi_version(void) {
     return LIBRT_BASE64_ABI_VERSION;
@@ -351,12 +343,9 @@ base64_api_version(void) {
     return LIBRT_BASE64_API_VERSION;
 }
 
-#endif
-
 static int
 librt_base64_module_exec(PyObject *m)
 {
-#ifdef MYPYC_EXPERIMENTAL
     // Export mypy internal C API, be careful with the order!
     static void *base64_api[LIBRT_BASE64_API_LEN] = {
         (void *)base64_abi_version,
@@ -368,7 +357,6 @@ librt_base64_module_exec(PyObject *m)
     if (PyModule_Add(m, "_C_API", c_api_object) < 0) {
         return -1;
     }
-#endif
     return 0;
 }
 

lib-rt/librt_base64.h lib-rt/base64/librt_base64.hlib-rt/librt_base64.h renamed to lib-rt/base64/librt_base64.h

@@ -1,17 +1,6 @@
 #ifndef LIBRT_BASE64_H
 #define LIBRT_BASE64_H
 
-#ifndef MYPYC_EXPERIMENTAL
-
-static int
-import_librt_base64(void)
-{
-    // All librt.base64 features are experimental for now, so don't set up the API here
-    return 0;
-}
-
-#else  // MYPYC_EXPERIMENTAL
-
 #include <Python.h>
 
 #define LIBRT_BASE64_ABI_VERSION 1
@@ -58,6 +47,4 @@ import_librt_base64(void)
     return 0;
 }
 
-#endif  // MYPYC_EXPERIMENTAL
-
 #endif  // LIBRT_BASE64_H

lib-rt/bytes_ops.c

@@ -183,3 +183,36 @@ int CPyBytes_Startswith(PyObject *self, PyObject *subobj) {
     }
     return ret;
 }
+
+int CPyBytes_Endswith(PyObject *self, PyObject *subobj) {
+    if (PyBytes_CheckExact(self) && PyBytes_CheckExact(subobj)) {
+        if (self == subobj) {
+            return 1;
+        }
+
+        Py_ssize_t subobj_len = PyBytes_GET_SIZE(subobj);
+        if (subobj_len == 0) {
+            return 1;
+        }
+
+        Py_ssize_t self_len = PyBytes_GET_SIZE(self);
+        if (subobj_len > self_len) {
+            return 0;
+        }
+
+        const char *self_buf = PyBytes_AS_STRING(self);
+        const char *subobj_buf = PyBytes_AS_STRING(subobj);
+
+        return memcmp(self_buf + (self_len - subobj_len), subobj_buf, (size_t)subobj_len) == 0 ? 1 : 0;
+    }
+    PyObject *result = PyObject_CallMethodOneArg(self, mypyc_interned_str.endswith, subobj);
+    if (result == NULL) {
+        return 2;
+    }
+    int ret = PyObject_IsTrue(result);
+    Py_DECREF(result);
+    if (ret < 0) {
+        return 2;
+    }
+    return ret;
+}

lib-rt/byteswriter_extra_ops.c

@@ -32,4 +32,14 @@ char CPyBytesWriter_Write(PyObject *obj, PyObject *value) {
     return CPY_NONE;
 }
 
+void CPyBytes_ReadError(int64_t index, Py_ssize_t size) {
+    if (index < 0) {
+        PyErr_SetString(PyExc_ValueError, "index must be non-negative");
+    } else {
+        PyErr_Format(PyExc_IndexError,
+                     "index %lld out of range for bytes of length %zd",
+                     (long long)index, size);
+    }
+}
+
 #endif // MYPYC_EXPERIMENTAL