pyogrio 0.9.0__cp312-cp312-win_amd64.whl → 0.11.0__cp312-cp312-win_amd64.whl

pyogrio/_geometry.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 3.0.10 */
+/* Generated by Cython 3.0.12 */
 
 /* BEGIN: Cython Metadata
 {
@@ -6,6 +6,7 @@
         "depends": [
             "C:\\vcpkg\\installed\\x64-windows-dynamic-release\\include\\cpl_conv.h",
             "C:\\vcpkg\\installed\\x64-windows-dynamic-release\\include\\cpl_error.h",
+            "C:\\vcpkg\\installed\\x64-windows-dynamic-release\\include\\cpl_port.h",
             "C:\\vcpkg\\installed\\x64-windows-dynamic-release\\include\\cpl_string.h",
             "C:\\vcpkg\\installed\\x64-windows-dynamic-release\\include\\cpl_vsi.h",
             "C:\\vcpkg\\installed\\x64-windows-dynamic-release\\include\\gdal.h",
@@ -57,10 +58,10 @@ END: Cython Metadata */
 #else
 #define __PYX_EXTRA_ABI_MODULE_NAME ""
 #endif
-#define CYTHON_ABI "3_0_10" __PYX_EXTRA_ABI_MODULE_NAME
+#define CYTHON_ABI "3_0_12" __PYX_EXTRA_ABI_MODULE_NAME
 #define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
 #define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
-#define CYTHON_HEX_VERSION 0x03000AF0
+#define CYTHON_HEX_VERSION 0x03000CF0
 #define CYTHON_FUTURE_DIVISION 1
 #include <stddef.h>
 #ifndef offsetof
@@ -1257,6 +1258,7 @@ static CYTHON_INLINE float __PYX_NAN() {
 #include <stdio.h>
 #include "cpl_conv.h"
 #include "cpl_error.h"
+#include "cpl_port.h"
 #include "cpl_string.h"
 #include "cpl_vsi.h"
 #include "ogr_core.h"
@@ -1513,6 +1515,7 @@ static const char *__pyx_filename;
 
 static const char *__pyx_f[] = {
   "pyogrio\\\\_geometry.pyx",
+  "pyogrio\\\\_err.pxd",
 };
 /* #### Code section: utility_code_proto_before_types ### */
 /* ForceInitThreads.proto */
@@ -1525,9 +1528,10 @@ static const char *__pyx_f[] = {
 /* #### Code section: type_declarations ### */
 
 /*--- Type declarations ---*/
+struct __pyx_obj_7pyogrio_4_err_ErrorHandler;
 struct __pyx_opt_args_7pyogrio_4_ogr_get_string;
 
-/* "pyogrio/_ogr.pxd":444
+/* "pyogrio/_ogr.pxd":514
  * 
  * 
  * cdef get_string(const char *c_str, str encoding=*)             # <<<<<<<<<<<<<<
@@ -1536,6 +1540,28 @@ struct __pyx_opt_args_7pyogrio_4_ogr_get_string {
   int __pyx_n;
   PyObject *encoding;
 };
+
+/* "pyogrio/_err.pxd":5
+ * cdef void *check_pointer(void *ptr) except NULL
+ * 
+ * cdef class ErrorHandler:             # <<<<<<<<<<<<<<
+ *     cdef object error_stack
+ *     cdef int check_int(self, int retval, bint squash_errors) except -1
+ */
+struct __pyx_obj_7pyogrio_4_err_ErrorHandler {
+  PyObject_HEAD
+  struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler *__pyx_vtab;
+  PyObject *error_stack;
+};
+
+
+
+struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler {
+  int (*check_int)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, int, int);
+  void *(*check_pointer)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, void *, int);
+  void (*_handle_error_stack)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, int);
+};
+static struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler *__pyx_vtabptr_7pyogrio_4_err_ErrorHandler;
 /* #### Code section: utility_code_proto ### */
 
 /* --- Runtime support code (head) --- */
@@ -1785,7 +1811,7 @@ static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args,
 #if !CYTHON_VECTORCALL
 #if PY_VERSION_HEX >= 0x03080000
   #include "frameobject.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
+#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif
@@ -1824,9 +1850,14 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_FastCallDict(PyObject *func, PyObj
 /* RaiseException.proto */
 static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause);
 
-/* PyObject_Str.proto */
-#define __Pyx_PyObject_Str(obj)\
-    (likely(PyString_CheckExact(obj)) ? __Pyx_NewRef(obj) : PyObject_Str(obj))
+/* PyObject_Unicode.proto */
+#if PY_MAJOR_VERSION >= 3
+#define __Pyx_PyObject_Unicode(obj)\
+    (likely(PyUnicode_CheckExact(obj)) ? __Pyx_NewRef(obj) : PyObject_Str(obj))
+#else
+#define __Pyx_PyObject_Unicode(obj)\
+    (likely(PyUnicode_CheckExact(obj)) ? __Pyx_NewRef(obj) : PyObject_Unicode(obj))
+#endif
 
 /* SwapException.proto */
 #if CYTHON_FAST_THREAD_STATE
@@ -1932,6 +1963,28 @@ static PyObject *__Pyx_PyDict_GetItem(PyObject *d, PyObject* key);
 #define __Pyx_PyObject_Dict_GetItem(obj, name)  PyObject_GetItem(obj, name)
 #endif
 
+/* TypeImport.proto */
+#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_12
+#define __PYX_HAVE_RT_ImportType_proto_3_0_12
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+#include <stdalign.h>
+#endif
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L
+#define __PYX_GET_STRUCT_ALIGNMENT_3_0_12(s) alignof(s)
+#else
+#define __PYX_GET_STRUCT_ALIGNMENT_3_0_12(s) sizeof(void*)
+#endif
+enum __Pyx_ImportType_CheckSize_3_0_12 {
+   __Pyx_ImportType_CheckSize_Error_3_0_12 = 0,
+   __Pyx_ImportType_CheckSize_Warn_3_0_12 = 1,
+   __Pyx_ImportType_CheckSize_Ignore_3_0_12 = 2
+};
+static PyTypeObject *__Pyx_ImportType_3_0_12(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_12 check_size);
+#endif
+
+/* GetVTable.proto */
+static void* __Pyx_GetVtable(PyTypeObject *type);
+
 /* Import.proto */
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level);
 
@@ -2053,7 +2106,7 @@ static int __Pyx_check_binary_version(unsigned long ct_version, unsigned long rt
 static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *sig);
 
 /* FunctionImport.proto */
-static int __Pyx_ImportFunction_3_0_10(PyObject *module, const char *funcname, void (**f)(void), const char *sig);
+static int __Pyx_ImportFunction_3_0_12(PyObject *module, const char *funcname, void (**f)(void), const char *sig);
 
 /* InitStrings.proto */
 static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
@@ -2069,7 +2122,7 @@ static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
 /* Module declarations from "pyogrio._ogr" */
 
 /* Module declarations from "pyogrio._err" */
-static void *(*__pyx_f_7pyogrio_4_err_exc_wrap_pointer)(void *); /*proto*/
+static void *(*__pyx_f_7pyogrio_4_err_check_pointer)(void *); /*proto*/
 
 /* Module declarations from "pyogrio._geometry" */
 static PyObject *__pyx_7genexpr__pyx_v_7pyogrio_9_geometry_k;
@@ -2107,6 +2160,7 @@ static const char __pyx_k_2_5D_Point[] = "2.5D Point";
 static const char __pyx_k_LineString[] = "LineString";
 static const char __pyx_k_LinearRing[] = "LinearRing";
 static const char __pyx_k_MultiPoint[] = "MultiPoint";
+static const char __pyx_k_pyx_vtable[] = "__pyx_vtable__";
 static const char __pyx_k_2_5D_Polygon[] = "2.5D Polygon";
 static const char __pyx_k_LineString_Z[] = "LineString Z";
 static const char __pyx_k_MultiPoint_Z[] = "MultiPoint Z";
@@ -2187,6 +2241,7 @@ typedef struct {
   #endif
   #if CYTHON_USE_MODULE_STATE
   #endif
+  PyTypeObject *__pyx_ptype_7pyogrio_4_err_ErrorHandler;
   #if CYTHON_USE_MODULE_STATE
   #endif
   PyObject *__pyx_kp_u_;
@@ -2250,6 +2305,7 @@ typedef struct {
   PyObject *__pyx_n_s_name;
   PyObject *__pyx_n_s_pyogrio__err;
   PyObject *__pyx_n_s_pyogrio_errors;
+  PyObject *__pyx_n_s_pyx_vtable;
   PyObject *__pyx_n_s_spec;
   PyObject *__pyx_n_s_test;
   PyObject *__pyx_n_s_update;
@@ -2304,6 +2360,7 @@ static int __pyx_m_clear(PyObject *m) {
   #ifdef __Pyx_FusedFunction_USED
   Py_CLEAR(clear_module_state->__pyx_FusedFunctionType);
   #endif
+  Py_CLEAR(clear_module_state->__pyx_ptype_7pyogrio_4_err_ErrorHandler);
   Py_CLEAR(clear_module_state->__pyx_kp_u_);
   Py_CLEAR(clear_module_state->__pyx_kp_u_2_5D_GeometryCollection);
   Py_CLEAR(clear_module_state->__pyx_kp_u_2_5D_LineString);
@@ -2365,6 +2422,7 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_name);
   Py_CLEAR(clear_module_state->__pyx_n_s_pyogrio__err);
   Py_CLEAR(clear_module_state->__pyx_n_s_pyogrio_errors);
+  Py_CLEAR(clear_module_state->__pyx_n_s_pyx_vtable);
   Py_CLEAR(clear_module_state->__pyx_n_s_spec);
   Py_CLEAR(clear_module_state->__pyx_n_s_test);
   Py_CLEAR(clear_module_state->__pyx_n_s_update);
@@ -2397,6 +2455,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   #ifdef __Pyx_FusedFunction_USED
   Py_VISIT(traverse_module_state->__pyx_FusedFunctionType);
   #endif
+  Py_VISIT(traverse_module_state->__pyx_ptype_7pyogrio_4_err_ErrorHandler);
   Py_VISIT(traverse_module_state->__pyx_kp_u_);
   Py_VISIT(traverse_module_state->__pyx_kp_u_2_5D_GeometryCollection);
   Py_VISIT(traverse_module_state->__pyx_kp_u_2_5D_LineString);
@@ -2458,6 +2517,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_name);
   Py_VISIT(traverse_module_state->__pyx_n_s_pyogrio__err);
   Py_VISIT(traverse_module_state->__pyx_n_s_pyogrio_errors);
+  Py_VISIT(traverse_module_state->__pyx_n_s_pyx_vtable);
   Py_VISIT(traverse_module_state->__pyx_n_s_spec);
   Py_VISIT(traverse_module_state->__pyx_n_s_test);
   Py_VISIT(traverse_module_state->__pyx_n_s_update);
@@ -2508,6 +2568,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #endif
 #if CYTHON_USE_MODULE_STATE
 #endif
+#define __pyx_ptype_7pyogrio_4_err_ErrorHandler __pyx_mstate_global->__pyx_ptype_7pyogrio_4_err_ErrorHandler
 #if CYTHON_USE_MODULE_STATE
 #endif
 #define __pyx_kp_u_ __pyx_mstate_global->__pyx_kp_u_
@@ -2571,6 +2632,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_name __pyx_mstate_global->__pyx_n_s_name
 #define __pyx_n_s_pyogrio__err __pyx_mstate_global->__pyx_n_s_pyogrio__err
 #define __pyx_n_s_pyogrio_errors __pyx_mstate_global->__pyx_n_s_pyogrio_errors
+#define __pyx_n_s_pyx_vtable __pyx_mstate_global->__pyx_n_s_pyx_vtable
 #define __pyx_n_s_spec __pyx_mstate_global->__pyx_n_s_spec
 #define __pyx_n_s_test __pyx_mstate_global->__pyx_n_s_test
 #define __pyx_n_s_update __pyx_mstate_global->__pyx_n_s_update
@@ -2594,9 +2656,8 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
  */
 
 static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr_layer) {
-  CYTHON_UNUSED void *__pyx_v_cogr_featuredef;
-  OGRwkbGeometryType __pyx_v_ogr_type;
   void *__pyx_v_ogr_featuredef;
+  OGRwkbGeometryType __pyx_v_ogr_type;
   PyObject *__pyx_v_exc = NULL;
   PyObject *__pyx_v_original_type = NULL;
   PyObject *__pyx_r = NULL;
@@ -2612,18 +2673,19 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
   int __pyx_t_9;
   PyObject *__pyx_t_10 = NULL;
   PyObject *__pyx_t_11 = NULL;
-  PyObject *__pyx_t_12 = NULL;
-  int __pyx_t_13;
-  char const *__pyx_t_14;
-  PyObject *__pyx_t_15 = NULL;
+  unsigned int __pyx_t_12;
+  PyObject *__pyx_t_13 = NULL;
+  int __pyx_t_14;
+  char const *__pyx_t_15;
   PyObject *__pyx_t_16 = NULL;
   PyObject *__pyx_t_17 = NULL;
   PyObject *__pyx_t_18 = NULL;
   PyObject *__pyx_t_19 = NULL;
   PyObject *__pyx_t_20 = NULL;
-  int __pyx_t_21;
-  Py_ssize_t __pyx_t_22;
-  Py_UCS4 __pyx_t_23;
+  PyObject *__pyx_t_21 = NULL;
+  int __pyx_t_22;
+  Py_ssize_t __pyx_t_23;
+  Py_UCS4 __pyx_t_24;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -2632,17 +2694,17 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
   /* "pyogrio/_geometry.pyx":83
  *         geometry type
  *     """
- *     cdef void *cogr_featuredef = NULL             # <<<<<<<<<<<<<<
+ *     cdef void *ogr_featuredef = NULL             # <<<<<<<<<<<<<<
  *     cdef OGRwkbGeometryType ogr_type
  * 
  */
-  __pyx_v_cogr_featuredef = NULL;
+  __pyx_v_ogr_featuredef = NULL;
 
   /* "pyogrio/_geometry.pyx":86
  *     cdef OGRwkbGeometryType ogr_type
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:
  */
   {
@@ -2657,18 +2719,18 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
       /* "pyogrio/_geometry.pyx":87
  * 
  *     try:
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))             # <<<<<<<<<<<<<<
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))             # <<<<<<<<<<<<<<
  *     except NullPointerError:
  *         raise DataLayerError("Could not get layer definition")
  */
-      __pyx_t_4 = __pyx_f_7pyogrio_4_err_exc_wrap_pointer(OGR_L_GetLayerDefn(__pyx_v_ogr_layer)); if (unlikely(__pyx_t_4 == ((void *)NULL))) __PYX_ERR(0, 87, __pyx_L3_error)
+      __pyx_t_4 = __pyx_f_7pyogrio_4_err_check_pointer(OGR_L_GetLayerDefn(__pyx_v_ogr_layer)); if (unlikely(__pyx_t_4 == ((void *)NULL))) __PYX_ERR(0, 87, __pyx_L3_error)
       __pyx_v_ogr_featuredef = __pyx_t_4;
 
       /* "pyogrio/_geometry.pyx":86
  *     cdef OGRwkbGeometryType ogr_type
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:
  */
     }
@@ -2680,7 +2742,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
 
     /* "pyogrio/_geometry.pyx":88
  *     try:
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:             # <<<<<<<<<<<<<<
  *         raise DataLayerError("Could not get layer definition")
  * 
@@ -2700,7 +2762,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
       __Pyx_XGOTREF(__pyx_t_5);
 
       /* "pyogrio/_geometry.pyx":89
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:
  *         raise DataLayerError("Could not get layer definition")             # <<<<<<<<<<<<<<
  * 
@@ -2709,7 +2771,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
       __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_DataLayerError); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 89, __pyx_L5_except_error)
       __Pyx_GOTREF(__pyx_t_10);
       __pyx_t_11 = NULL;
-      __pyx_t_9 = 0;
+      __pyx_t_12 = 0;
       #if CYTHON_UNPACK_METHODS
       if (unlikely(PyMethod_Check(__pyx_t_10))) {
         __pyx_t_11 = PyMethod_GET_SELF(__pyx_t_10);
@@ -2718,13 +2780,13 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
           __Pyx_INCREF(__pyx_t_11);
           __Pyx_INCREF(function);
           __Pyx_DECREF_SET(__pyx_t_10, function);
-          __pyx_t_9 = 1;
+          __pyx_t_12 = 1;
         }
       }
       #endif
       {
         PyObject *__pyx_callargs[2] = {__pyx_t_11, __pyx_kp_u_Could_not_get_layer_definition};
-        __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
+        __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12);
         __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
         if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 89, __pyx_L5_except_error)
         __Pyx_GOTREF(__pyx_t_8);
@@ -2768,26 +2830,26 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
  */
         __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_DataLayerError); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 92, __pyx_L16_error)
         __Pyx_GOTREF(__pyx_t_10);
-        __pyx_t_11 = __Pyx_PyObject_Str(__pyx_v_exc); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 92, __pyx_L16_error)
+        __pyx_t_11 = __Pyx_PyObject_Unicode(__pyx_v_exc); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 92, __pyx_L16_error)
         __Pyx_GOTREF(__pyx_t_11);
-        __pyx_t_12 = NULL;
-        __pyx_t_9 = 0;
+        __pyx_t_13 = NULL;
+        __pyx_t_12 = 0;
         #if CYTHON_UNPACK_METHODS
         if (unlikely(PyMethod_Check(__pyx_t_10))) {
-          __pyx_t_12 = PyMethod_GET_SELF(__pyx_t_10);
-          if (likely(__pyx_t_12)) {
+          __pyx_t_13 = PyMethod_GET_SELF(__pyx_t_10);
+          if (likely(__pyx_t_13)) {
             PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_10);
-            __Pyx_INCREF(__pyx_t_12);
+            __Pyx_INCREF(__pyx_t_13);
             __Pyx_INCREF(function);
             __Pyx_DECREF_SET(__pyx_t_10, function);
-            __pyx_t_9 = 1;
+            __pyx_t_12 = 1;
           }
         }
         #endif
         {
-          PyObject *__pyx_callargs[2] = {__pyx_t_12, __pyx_t_11};
-          __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
-          __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;
+          PyObject *__pyx_callargs[2] = {__pyx_t_13, __pyx_t_11};
+          __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12);
+          __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
           if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 92, __pyx_L16_error)
           __Pyx_GOTREF(__pyx_t_8);
@@ -2810,35 +2872,35 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
         /*exception exit:*/{
           __Pyx_PyThreadState_declare
           __Pyx_PyThreadState_assign
-          __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __pyx_t_20 = 0;
+          __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0;
           __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
           __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
-          __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;
+          __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;
           __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-          if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_18, &__pyx_t_19, &__pyx_t_20);
-          if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_15, &__pyx_t_16, &__pyx_t_17) < 0)) __Pyx_ErrFetch(&__pyx_t_15, &__pyx_t_16, &__pyx_t_17);
-          __Pyx_XGOTREF(__pyx_t_15);
+          if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_19, &__pyx_t_20, &__pyx_t_21);
+          if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_16, &__pyx_t_17, &__pyx_t_18) < 0)) __Pyx_ErrFetch(&__pyx_t_16, &__pyx_t_17, &__pyx_t_18);
           __Pyx_XGOTREF(__pyx_t_16);
           __Pyx_XGOTREF(__pyx_t_17);
           __Pyx_XGOTREF(__pyx_t_18);
           __Pyx_XGOTREF(__pyx_t_19);
           __Pyx_XGOTREF(__pyx_t_20);
-          __pyx_t_9 = __pyx_lineno; __pyx_t_13 = __pyx_clineno; __pyx_t_14 = __pyx_filename;
+          __Pyx_XGOTREF(__pyx_t_21);
+          __pyx_t_9 = __pyx_lineno; __pyx_t_14 = __pyx_clineno; __pyx_t_15 = __pyx_filename;
           {
             __Pyx_DECREF(__pyx_v_exc); __pyx_v_exc = 0;
           }
           if (PY_MAJOR_VERSION >= 3) {
-            __Pyx_XGIVEREF(__pyx_t_18);
             __Pyx_XGIVEREF(__pyx_t_19);
             __Pyx_XGIVEREF(__pyx_t_20);
-            __Pyx_ExceptionReset(__pyx_t_18, __pyx_t_19, __pyx_t_20);
+            __Pyx_XGIVEREF(__pyx_t_21);
+            __Pyx_ExceptionReset(__pyx_t_19, __pyx_t_20, __pyx_t_21);
           }
-          __Pyx_XGIVEREF(__pyx_t_15);
           __Pyx_XGIVEREF(__pyx_t_16);
           __Pyx_XGIVEREF(__pyx_t_17);
-          __Pyx_ErrRestore(__pyx_t_15, __pyx_t_16, __pyx_t_17);
-          __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __pyx_t_20 = 0;
-          __pyx_lineno = __pyx_t_9; __pyx_clineno = __pyx_t_13; __pyx_filename = __pyx_t_14;
+          __Pyx_XGIVEREF(__pyx_t_18);
+          __Pyx_ErrRestore(__pyx_t_16, __pyx_t_17, __pyx_t_18);
+          __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0;
+          __pyx_lineno = __pyx_t_9; __pyx_clineno = __pyx_t_14; __pyx_filename = __pyx_t_15;
           goto __pyx_L5_except_error;
         }
       }
@@ -2849,7 +2911,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
  *     cdef OGRwkbGeometryType ogr_type
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:
  */
     __pyx_L5_except_error:;
@@ -2881,10 +2943,10 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_GEOMETRY_TYPES); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 96, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_21 = (__Pyx_PySequence_ContainsTF(__pyx_t_5, __pyx_t_6, Py_NE)); if (unlikely((__pyx_t_21 < 0))) __PYX_ERR(0, 96, __pyx_L1_error)
+  __pyx_t_22 = (__Pyx_PySequence_ContainsTF(__pyx_t_5, __pyx_t_6, Py_NE)); if (unlikely((__pyx_t_22 < 0))) __PYX_ERR(0, 96, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  if (unlikely(__pyx_t_21)) {
+  if (unlikely(__pyx_t_22)) {
 
     /* "pyogrio/_geometry.pyx":97
  * 
@@ -2901,7 +2963,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
     __Pyx_GOTREF(__pyx_t_8);
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
     __pyx_t_7 = NULL;
-    __pyx_t_13 = 0;
+    __pyx_t_12 = 0;
     #if CYTHON_UNPACK_METHODS
     if (unlikely(PyMethod_Check(__pyx_t_5))) {
       __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_5);
@@ -2910,13 +2972,13 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
         __Pyx_INCREF(__pyx_t_7);
         __Pyx_INCREF(function);
         __Pyx_DECREF_SET(__pyx_t_5, function);
-        __pyx_t_13 = 1;
+        __pyx_t_12 = 1;
       }
     }
     #endif
     {
       PyObject *__pyx_callargs[2] = {__pyx_t_7, __pyx_t_8};
-      __pyx_t_6 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_13, 1+__pyx_t_13);
+      __pyx_t_6 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12);
       __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;
       __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
       if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 97, __pyx_L1_error)
@@ -2943,8 +3005,8 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
  *         original_type = GEOMETRY_TYPES[ogr_type]
  * 
  */
-  __pyx_t_21 = (OGR_GT_HasM(__pyx_v_ogr_type) != 0);
-  if (__pyx_t_21) {
+  __pyx_t_22 = (OGR_GT_HasM(__pyx_v_ogr_type) != 0);
+  if (__pyx_t_22) {
 
     /* "pyogrio/_geometry.pyx":100
  * 
@@ -2995,10 +3057,10 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
  */
     __pyx_t_5 = PyTuple_New(5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 107, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
-    __pyx_t_22 = 0;
-    __pyx_t_23 = 127;
+    __pyx_t_23 = 0;
+    __pyx_t_24 = 127;
     __Pyx_INCREF(__pyx_kp_u_Measured_M_geometry_types_are_no);
-    __pyx_t_22 += 62;
+    __pyx_t_23 += 62;
     __Pyx_GIVEREF(__pyx_kp_u_Measured_M_geometry_types_are_no);
     PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_u_Measured_M_geometry_types_are_no);
 
@@ -3011,13 +3073,13 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
  */
     __pyx_t_7 = __Pyx_PyObject_FormatSimple(__pyx_v_original_type, __pyx_empty_unicode); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 108, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
-    __pyx_t_23 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_7) > __pyx_t_23) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_7) : __pyx_t_23;
-    __pyx_t_22 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_7);
+    __pyx_t_24 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_7) > __pyx_t_24) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_7) : __pyx_t_24;
+    __pyx_t_23 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_7);
     __Pyx_GIVEREF(__pyx_t_7);
     PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_7);
     __pyx_t_7 = 0;
     __Pyx_INCREF(__pyx_kp_u_is_converted_to);
-    __pyx_t_22 += 19;
+    __pyx_t_23 += 19;
     __Pyx_GIVEREF(__pyx_kp_u_is_converted_to);
     PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_kp_u_is_converted_to);
 
@@ -3039,13 +3101,13 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
     __pyx_t_10 = __Pyx_PyObject_FormatSimple(__pyx_t_11, __pyx_empty_unicode); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 109, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_10);
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-    __pyx_t_23 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_10) > __pyx_t_23) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_10) : __pyx_t_23;
-    __pyx_t_22 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_10);
+    __pyx_t_24 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_10) > __pyx_t_24) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_10) : __pyx_t_24;
+    __pyx_t_23 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_10);
     __Pyx_GIVEREF(__pyx_t_10);
     PyTuple_SET_ITEM(__pyx_t_5, 3, __pyx_t_10);
     __pyx_t_10 = 0;
     __Pyx_INCREF(__pyx_kp_u_);
-    __pyx_t_22 += 1;
+    __pyx_t_23 += 1;
     __Pyx_GIVEREF(__pyx_kp_u_);
     PyTuple_SET_ITEM(__pyx_t_5, 4, __pyx_kp_u_);
 
@@ -3056,11 +3118,11 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
  *             f"Original type '{original_type}' "
  *             f"is converted to '{GEOMETRY_TYPES[ogr_type]}'")
  */
-    __pyx_t_10 = __Pyx_PyUnicode_Join(__pyx_t_5, 5, __pyx_t_22, __pyx_t_23); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 107, __pyx_L1_error)
+    __pyx_t_10 = __Pyx_PyUnicode_Join(__pyx_t_5, 5, __pyx_t_23, __pyx_t_24); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 107, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_10);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_t_5 = NULL;
-    __pyx_t_13 = 0;
+    __pyx_t_12 = 0;
     #if CYTHON_UNPACK_METHODS
     if (unlikely(PyMethod_Check(__pyx_t_6))) {
       __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_6);
@@ -3069,13 +3131,13 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
         __Pyx_INCREF(__pyx_t_5);
         __Pyx_INCREF(function);
         __Pyx_DECREF_SET(__pyx_t_6, function);
-        __pyx_t_13 = 1;
+        __pyx_t_12 = 1;
       }
     }
     #endif
     {
       PyObject *__pyx_callargs[2] = {__pyx_t_5, __pyx_t_10};
-      __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_13, 1+__pyx_t_13);
+      __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12);
       __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
       __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
       if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 106, __pyx_L1_error)
@@ -3130,7 +3192,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
   __Pyx_XDECREF(__pyx_t_8);
   __Pyx_XDECREF(__pyx_t_10);
   __Pyx_XDECREF(__pyx_t_11);
-  __Pyx_XDECREF(__pyx_t_12);
+  __Pyx_XDECREF(__pyx_t_13);
   __Pyx_AddTraceback("pyogrio._geometry.get_geometry_type", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = 0;
   __pyx_L0:;
@@ -3157,7 +3219,7 @@ static OGRwkbGeometryType __pyx_f_7pyogrio_9_geometry_get_geometry_type_code(PyO
   PyObject *__pyx_t_3 = NULL;
   PyObject *__pyx_t_4 = NULL;
   PyObject *__pyx_t_5 = NULL;
-  int __pyx_t_6;
+  unsigned int __pyx_t_6;
   OGRwkbGeometryType __pyx_t_7;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
@@ -3340,6 +3402,7 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_name, __pyx_k_name, sizeof(__pyx_k_name), 0, 0, 1, 1},
     {&__pyx_n_s_pyogrio__err, __pyx_k_pyogrio__err, sizeof(__pyx_k_pyogrio__err), 0, 0, 1, 1},
     {&__pyx_n_s_pyogrio_errors, __pyx_k_pyogrio_errors, sizeof(__pyx_k_pyogrio_errors), 0, 0, 1, 1},
+    {&__pyx_n_s_pyx_vtable, __pyx_k_pyx_vtable, sizeof(__pyx_k_pyx_vtable), 0, 0, 1, 1},
     {&__pyx_n_s_spec, __pyx_k_spec, sizeof(__pyx_k_spec), 0, 0, 1, 1},
     {&__pyx_n_s_test, __pyx_k_test, sizeof(__pyx_k_test), 0, 0, 1, 1},
     {&__pyx_n_s_update, __pyx_k_update, sizeof(__pyx_k_update), 0, 0, 1, 1},
@@ -3435,10 +3498,23 @@ static int __Pyx_modinit_type_init_code(void) {
 
 static int __Pyx_modinit_type_import_code(void) {
   __Pyx_RefNannyDeclarations
+  PyObject *__pyx_t_1 = NULL;
+  int __pyx_lineno = 0;
+  const char *__pyx_filename = NULL;
+  int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__Pyx_modinit_type_import_code", 0);
   /*--- Type import code ---*/
+  __pyx_t_1 = PyImport_ImportModule("pyogrio._err"); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_ptype_7pyogrio_4_err_ErrorHandler = __Pyx_ImportType_3_0_12(__pyx_t_1, "pyogrio._err", "ErrorHandler", sizeof(struct __pyx_obj_7pyogrio_4_err_ErrorHandler), __PYX_GET_STRUCT_ALIGNMENT_3_0_12(struct __pyx_obj_7pyogrio_4_err_ErrorHandler),__Pyx_ImportType_CheckSize_Warn_3_0_12); if (!__pyx_ptype_7pyogrio_4_err_ErrorHandler) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_vtabptr_7pyogrio_4_err_ErrorHandler = (struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler*)__Pyx_GetVtable(__pyx_ptype_7pyogrio_4_err_ErrorHandler); if (unlikely(!__pyx_vtabptr_7pyogrio_4_err_ErrorHandler)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
+  __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_t_1);
+  __Pyx_RefNannyFinishContext();
+  return -1;
 }
 
 static int __Pyx_modinit_variable_import_code(void) {
@@ -3459,7 +3535,7 @@ static int __Pyx_modinit_function_import_code(void) {
   /*--- Function import code ---*/
   __pyx_t_1 = PyImport_ImportModule("pyogrio._err"); if (!__pyx_t_1) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  if (__Pyx_ImportFunction_3_0_10(__pyx_t_1, "exc_wrap_pointer", (void (**)(void))&__pyx_f_7pyogrio_4_err_exc_wrap_pointer, "void *(void *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
+  if (__Pyx_ImportFunction_3_0_12(__pyx_t_1, "check_pointer", (void (**)(void))&__pyx_f_7pyogrio_4_err_check_pointer, "void *(void *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
@@ -3746,7 +3822,7 @@ if (!__Pyx_RefNanny) {
   (void)__Pyx_modinit_variable_export_code();
   if (unlikely((__Pyx_modinit_function_export_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   (void)__Pyx_modinit_type_init_code();
-  (void)__Pyx_modinit_type_import_code();
+  if (unlikely((__Pyx_modinit_type_import_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   (void)__Pyx_modinit_variable_import_code();
   if (unlikely((__Pyx_modinit_function_import_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   /*--- Execution code ---*/
@@ -3823,9 +3899,9 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":11
  * 
  * GEOMETRY_TYPES = {
- *     wkbUnknown: 'Unknown',             # <<<<<<<<<<<<<<
- *     wkbPoint: 'Point',
- *     wkbLineString: 'LineString',
+ *     wkbUnknown: "Unknown",             # <<<<<<<<<<<<<<
+ *     wkbPoint: "Point",
+ *     wkbLineString: "LineString",
  */
   __pyx_t_2 = __Pyx_PyDict_NewPresized(31); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 11, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
@@ -3836,10 +3912,10 @@ if (!__Pyx_RefNanny) {
 
   /* "pyogrio/_geometry.pyx":12
  * GEOMETRY_TYPES = {
- *     wkbUnknown: 'Unknown',
- *     wkbPoint: 'Point',             # <<<<<<<<<<<<<<
- *     wkbLineString: 'LineString',
- *     wkbPolygon: 'Polygon',
+ *     wkbUnknown: "Unknown",
+ *     wkbPoint: "Point",             # <<<<<<<<<<<<<<
+ *     wkbLineString: "LineString",
+ *     wkbPolygon: "Polygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPoint); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3847,11 +3923,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":13
- *     wkbUnknown: 'Unknown',
- *     wkbPoint: 'Point',
- *     wkbLineString: 'LineString',             # <<<<<<<<<<<<<<
- *     wkbPolygon: 'Polygon',
- *     wkbMultiPoint: 'MultiPoint',
+ *     wkbUnknown: "Unknown",
+ *     wkbPoint: "Point",
+ *     wkbLineString: "LineString",             # <<<<<<<<<<<<<<
+ *     wkbPolygon: "Polygon",
+ *     wkbMultiPoint: "MultiPoint",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineString); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 13, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3859,11 +3935,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":14
- *     wkbPoint: 'Point',
- *     wkbLineString: 'LineString',
- *     wkbPolygon: 'Polygon',             # <<<<<<<<<<<<<<
- *     wkbMultiPoint: 'MultiPoint',
- *     wkbMultiLineString: 'MultiLineString',
+ *     wkbPoint: "Point",
+ *     wkbLineString: "LineString",
+ *     wkbPolygon: "Polygon",             # <<<<<<<<<<<<<<
+ *     wkbMultiPoint: "MultiPoint",
+ *     wkbMultiLineString: "MultiLineString",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygon); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 14, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3871,11 +3947,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":15
- *     wkbLineString: 'LineString',
- *     wkbPolygon: 'Polygon',
- *     wkbMultiPoint: 'MultiPoint',             # <<<<<<<<<<<<<<
- *     wkbMultiLineString: 'MultiLineString',
- *     wkbMultiPolygon: 'MultiPolygon',
+ *     wkbLineString: "LineString",
+ *     wkbPolygon: "Polygon",
+ *     wkbMultiPoint: "MultiPoint",             # <<<<<<<<<<<<<<
+ *     wkbMultiLineString: "MultiLineString",
+ *     wkbMultiPolygon: "MultiPolygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPoint); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 15, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3883,11 +3959,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":16
- *     wkbPolygon: 'Polygon',
- *     wkbMultiPoint: 'MultiPoint',
- *     wkbMultiLineString: 'MultiLineString',             # <<<<<<<<<<<<<<
- *     wkbMultiPolygon: 'MultiPolygon',
- *     wkbGeometryCollection: 'GeometryCollection',
+ *     wkbPolygon: "Polygon",
+ *     wkbMultiPoint: "MultiPoint",
+ *     wkbMultiLineString: "MultiLineString",             # <<<<<<<<<<<<<<
+ *     wkbMultiPolygon: "MultiPolygon",
+ *     wkbGeometryCollection: "GeometryCollection",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineString); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 16, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3895,10 +3971,10 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":17
- *     wkbMultiPoint: 'MultiPoint',
- *     wkbMultiLineString: 'MultiLineString',
- *     wkbMultiPolygon: 'MultiPolygon',             # <<<<<<<<<<<<<<
- *     wkbGeometryCollection: 'GeometryCollection',
+ *     wkbMultiPoint: "MultiPoint",
+ *     wkbMultiLineString: "MultiLineString",
+ *     wkbMultiPolygon: "MultiPolygon",             # <<<<<<<<<<<<<<
+ *     wkbGeometryCollection: "GeometryCollection",
  *     wkbNone: None,
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygon); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 17, __pyx_L1_error)
@@ -3907,11 +3983,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":18
- *     wkbMultiLineString: 'MultiLineString',
- *     wkbMultiPolygon: 'MultiPolygon',
- *     wkbGeometryCollection: 'GeometryCollection',             # <<<<<<<<<<<<<<
+ *     wkbMultiLineString: "MultiLineString",
+ *     wkbMultiPolygon: "MultiPolygon",
+ *     wkbGeometryCollection: "GeometryCollection",             # <<<<<<<<<<<<<<
  *     wkbNone: None,
- *     wkbLinearRing: 'LinearRing',
+ *     wkbLinearRing: "LinearRing",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbGeometryCollection); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 18, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3919,10 +3995,10 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":19
- *     wkbMultiPolygon: 'MultiPolygon',
- *     wkbGeometryCollection: 'GeometryCollection',
+ *     wkbMultiPolygon: "MultiPolygon",
+ *     wkbGeometryCollection: "GeometryCollection",
  *     wkbNone: None,             # <<<<<<<<<<<<<<
- *     wkbLinearRing: 'LinearRing',
+ *     wkbLinearRing: "LinearRing",
  *     # WARNING: Measured types are not supported in GEOS and downstream uses
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbNone); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 19, __pyx_L1_error)
@@ -3931,9 +4007,9 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":20
- *     wkbGeometryCollection: 'GeometryCollection',
+ *     wkbGeometryCollection: "GeometryCollection",
  *     wkbNone: None,
- *     wkbLinearRing: 'LinearRing',             # <<<<<<<<<<<<<<
+ *     wkbLinearRing: "LinearRing",             # <<<<<<<<<<<<<<
  *     # WARNING: Measured types are not supported in GEOS and downstream uses
  *     # these are stripped automatically to their corresponding 2D / 3D types
  */
@@ -3945,9 +4021,9 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":23
  *     # WARNING: Measured types are not supported in GEOS and downstream uses
  *     # these are stripped automatically to their corresponding 2D / 3D types
- *     wkbPointM: 'PointM',             # <<<<<<<<<<<<<<
- *     wkbLineStringM: 'Measured LineString',
- *     wkbPolygonM: 'Measured Polygon',
+ *     wkbPointM: "PointM",             # <<<<<<<<<<<<<<
+ *     wkbLineStringM: "Measured LineString",
+ *     wkbPolygonM: "Measured Polygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPointM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 23, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3956,10 +4032,10 @@ if (!__Pyx_RefNanny) {
 
   /* "pyogrio/_geometry.pyx":24
  *     # these are stripped automatically to their corresponding 2D / 3D types
- *     wkbPointM: 'PointM',
- *     wkbLineStringM: 'Measured LineString',             # <<<<<<<<<<<<<<
- *     wkbPolygonM: 'Measured Polygon',
- *     wkbMultiPointM: 'Measured MultiPoint',
+ *     wkbPointM: "PointM",
+ *     wkbLineStringM: "Measured LineString",             # <<<<<<<<<<<<<<
+ *     wkbPolygonM: "Measured Polygon",
+ *     wkbMultiPointM: "Measured MultiPoint",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineStringM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 24, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3967,11 +4043,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":25
- *     wkbPointM: 'PointM',
- *     wkbLineStringM: 'Measured LineString',
- *     wkbPolygonM: 'Measured Polygon',             # <<<<<<<<<<<<<<
- *     wkbMultiPointM: 'Measured MultiPoint',
- *     wkbMultiLineStringM: 'Measured MultiLineString',
+ *     wkbPointM: "PointM",
+ *     wkbLineStringM: "Measured LineString",
+ *     wkbPolygonM: "Measured Polygon",             # <<<<<<<<<<<<<<
+ *     wkbMultiPointM: "Measured MultiPoint",
+ *     wkbMultiLineStringM: "Measured MultiLineString",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygonM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 25, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3979,11 +4055,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":26
- *     wkbLineStringM: 'Measured LineString',
- *     wkbPolygonM: 'Measured Polygon',
- *     wkbMultiPointM: 'Measured MultiPoint',             # <<<<<<<<<<<<<<
- *     wkbMultiLineStringM: 'Measured MultiLineString',
- *     wkbMultiPolygonM: 'Measured MultiPolygon',
+ *     wkbLineStringM: "Measured LineString",
+ *     wkbPolygonM: "Measured Polygon",
+ *     wkbMultiPointM: "Measured MultiPoint",             # <<<<<<<<<<<<<<
+ *     wkbMultiLineStringM: "Measured MultiLineString",
+ *     wkbMultiPolygonM: "Measured MultiPolygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPointM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 26, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3991,11 +4067,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":27
- *     wkbPolygonM: 'Measured Polygon',
- *     wkbMultiPointM: 'Measured MultiPoint',
- *     wkbMultiLineStringM: 'Measured MultiLineString',             # <<<<<<<<<<<<<<
- *     wkbMultiPolygonM: 'Measured MultiPolygon',
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',
+ *     wkbPolygonM: "Measured Polygon",
+ *     wkbMultiPointM: "Measured MultiPoint",
+ *     wkbMultiLineStringM: "Measured MultiLineString",             # <<<<<<<<<<<<<<
+ *     wkbMultiPolygonM: "Measured MultiPolygon",
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineStringM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 27, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4003,11 +4079,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":28
- *     wkbMultiPointM: 'Measured MultiPoint',
- *     wkbMultiLineStringM: 'Measured MultiLineString',
- *     wkbMultiPolygonM: 'Measured MultiPolygon',             # <<<<<<<<<<<<<<
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',
- *     wkbPointZM: 'Measured 3D Point',
+ *     wkbMultiPointM: "Measured MultiPoint",
+ *     wkbMultiLineStringM: "Measured MultiLineString",
+ *     wkbMultiPolygonM: "Measured MultiPolygon",             # <<<<<<<<<<<<<<
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",
+ *     wkbPointZM: "Measured 3D Point",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygonM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 28, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4015,11 +4091,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":29
- *     wkbMultiLineStringM: 'Measured MultiLineString',
- *     wkbMultiPolygonM: 'Measured MultiPolygon',
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',             # <<<<<<<<<<<<<<
- *     wkbPointZM: 'Measured 3D Point',
- *     wkbLineStringZM: 'Measured 3D LineString',
+ *     wkbMultiLineStringM: "Measured MultiLineString",
+ *     wkbMultiPolygonM: "Measured MultiPolygon",
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",             # <<<<<<<<<<<<<<
+ *     wkbPointZM: "Measured 3D Point",
+ *     wkbLineStringZM: "Measured 3D LineString",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbGeometryCollectionM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 29, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4027,11 +4103,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":30
- *     wkbMultiPolygonM: 'Measured MultiPolygon',
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',
- *     wkbPointZM: 'Measured 3D Point',             # <<<<<<<<<<<<<<
- *     wkbLineStringZM: 'Measured 3D LineString',
- *     wkbPolygonZM: 'Measured 3D Polygon',
+ *     wkbMultiPolygonM: "Measured MultiPolygon",
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",
+ *     wkbPointZM: "Measured 3D Point",             # <<<<<<<<<<<<<<
+ *     wkbLineStringZM: "Measured 3D LineString",
+ *     wkbPolygonZM: "Measured 3D Polygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPointZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 30, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4039,11 +4115,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":31
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',
- *     wkbPointZM: 'Measured 3D Point',
- *     wkbLineStringZM: 'Measured 3D LineString',             # <<<<<<<<<<<<<<
- *     wkbPolygonZM: 'Measured 3D Polygon',
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",
+ *     wkbPointZM: "Measured 3D Point",
+ *     wkbLineStringZM: "Measured 3D LineString",             # <<<<<<<<<<<<<<
+ *     wkbPolygonZM: "Measured 3D Polygon",
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineStringZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 31, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4051,11 +4127,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":32
- *     wkbPointZM: 'Measured 3D Point',
- *     wkbLineStringZM: 'Measured 3D LineString',
- *     wkbPolygonZM: 'Measured 3D Polygon',             # <<<<<<<<<<<<<<
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',
+ *     wkbPointZM: "Measured 3D Point",
+ *     wkbLineStringZM: "Measured 3D LineString",
+ *     wkbPolygonZM: "Measured 3D Polygon",             # <<<<<<<<<<<<<<
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygonZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 32, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4063,11 +4139,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":33
- *     wkbLineStringZM: 'Measured 3D LineString',
- *     wkbPolygonZM: 'Measured 3D Polygon',
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',             # <<<<<<<<<<<<<<
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
+ *     wkbLineStringZM: "Measured 3D LineString",
+ *     wkbPolygonZM: "Measured 3D Polygon",
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",             # <<<<<<<<<<<<<<
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPointZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 33, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4075,11 +4151,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":34
- *     wkbPolygonZM: 'Measured 3D Polygon',
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',             # <<<<<<<<<<<<<<
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
+ *     wkbPolygonZM: "Measured 3D Polygon",
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",             # <<<<<<<<<<<<<<
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineStringZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 34, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4087,11 +4163,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":35
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',             # <<<<<<<<<<<<<<
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
- *     wkbPoint25D: 'Point Z',
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",             # <<<<<<<<<<<<<<
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
+ *     wkbPoint25D: "Point Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygonZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 35, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4099,11 +4175,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":36
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',             # <<<<<<<<<<<<<<
- *     wkbPoint25D: 'Point Z',
- *     wkbLineString25D: 'LineString Z',
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",             # <<<<<<<<<<<<<<
+ *     wkbPoint25D: "Point Z",
+ *     wkbLineString25D: "LineString Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbGeometryCollectionZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 36, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4111,11 +4187,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":37
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
- *     wkbPoint25D: 'Point Z',             # <<<<<<<<<<<<<<
- *     wkbLineString25D: 'LineString Z',
- *     wkbPolygon25D: 'Polygon Z',
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
+ *     wkbPoint25D: "Point Z",             # <<<<<<<<<<<<<<
+ *     wkbLineString25D: "LineString Z",
+ *     wkbPolygon25D: "Polygon Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPoint25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 37, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4123,11 +4199,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":38
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
- *     wkbPoint25D: 'Point Z',
- *     wkbLineString25D: 'LineString Z',             # <<<<<<<<<<<<<<
- *     wkbPolygon25D: 'Polygon Z',
- *     wkbMultiPoint25D: 'MultiPoint Z',
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
+ *     wkbPoint25D: "Point Z",
+ *     wkbLineString25D: "LineString Z",             # <<<<<<<<<<<<<<
+ *     wkbPolygon25D: "Polygon Z",
+ *     wkbMultiPoint25D: "MultiPoint Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineString25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 38, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4135,11 +4211,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":39
- *     wkbPoint25D: 'Point Z',
- *     wkbLineString25D: 'LineString Z',
- *     wkbPolygon25D: 'Polygon Z',             # <<<<<<<<<<<<<<
- *     wkbMultiPoint25D: 'MultiPoint Z',
- *     wkbMultiLineString25D: 'MultiLineString Z',
+ *     wkbPoint25D: "Point Z",
+ *     wkbLineString25D: "LineString Z",
+ *     wkbPolygon25D: "Polygon Z",             # <<<<<<<<<<<<<<
+ *     wkbMultiPoint25D: "MultiPoint Z",
+ *     wkbMultiLineString25D: "MultiLineString Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygon25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 39, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4147,11 +4223,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":40
- *     wkbLineString25D: 'LineString Z',
- *     wkbPolygon25D: 'Polygon Z',
- *     wkbMultiPoint25D: 'MultiPoint Z',             # <<<<<<<<<<<<<<
- *     wkbMultiLineString25D: 'MultiLineString Z',
- *     wkbMultiPolygon25D: 'MultiPolygon Z',
+ *     wkbLineString25D: "LineString Z",
+ *     wkbPolygon25D: "Polygon Z",
+ *     wkbMultiPoint25D: "MultiPoint Z",             # <<<<<<<<<<<<<<
+ *     wkbMultiLineString25D: "MultiLineString Z",
+ *     wkbMultiPolygon25D: "MultiPolygon Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPoint25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 40, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4159,11 +4235,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":41
- *     wkbPolygon25D: 'Polygon Z',
- *     wkbMultiPoint25D: 'MultiPoint Z',
- *     wkbMultiLineString25D: 'MultiLineString Z',             # <<<<<<<<<<<<<<
- *     wkbMultiPolygon25D: 'MultiPolygon Z',
- *     wkbGeometryCollection25D: 'GeometryCollection Z',
+ *     wkbPolygon25D: "Polygon Z",
+ *     wkbMultiPoint25D: "MultiPoint Z",
+ *     wkbMultiLineString25D: "MultiLineString Z",             # <<<<<<<<<<<<<<
+ *     wkbMultiPolygon25D: "MultiPolygon Z",
+ *     wkbGeometryCollection25D: "GeometryCollection Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineString25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4171,10 +4247,10 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":42
- *     wkbMultiPoint25D: 'MultiPoint Z',
- *     wkbMultiLineString25D: 'MultiLineString Z',
- *     wkbMultiPolygon25D: 'MultiPolygon Z',             # <<<<<<<<<<<<<<
- *     wkbGeometryCollection25D: 'GeometryCollection Z',
+ *     wkbMultiPoint25D: "MultiPoint Z",
+ *     wkbMultiLineString25D: "MultiLineString Z",
+ *     wkbMultiPolygon25D: "MultiPolygon Z",             # <<<<<<<<<<<<<<
+ *     wkbGeometryCollection25D: "GeometryCollection Z",
  * }
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygon25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 42, __pyx_L1_error)
@@ -4183,9 +4259,9 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":43
- *     wkbMultiLineString25D: 'MultiLineString Z',
- *     wkbMultiPolygon25D: 'MultiPolygon Z',
- *     wkbGeometryCollection25D: 'GeometryCollection Z',             # <<<<<<<<<<<<<<
+ *     wkbMultiLineString25D: "MultiLineString Z",
+ *     wkbMultiPolygon25D: "MultiPolygon Z",
+ *     wkbGeometryCollection25D: "GeometryCollection Z",             # <<<<<<<<<<<<<<
  * }
  * 
  */
@@ -4199,7 +4275,7 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":46
  * }
  * 
- * GEOMETRY_TYPE_CODES = {v:k for k, v in GEOMETRY_TYPES.items()}             # <<<<<<<<<<<<<<
+ * GEOMETRY_TYPE_CODES = {v: k for k, v in GEOMETRY_TYPES.items()}             # <<<<<<<<<<<<<<
  * 
  * # add additional aliases from 2.5D format
  */
@@ -4256,8 +4332,8 @@ if (!__Pyx_RefNanny) {
  * 
  * # add additional aliases from 2.5D format
  * GEOMETRY_TYPE_CODES.update({             # <<<<<<<<<<<<<<
- *     '2.5D Point': wkbPoint25D,
- *     '2.5D LineString': wkbLineString25D,
+ *     "2.5D Point": wkbPoint25D,
+ *     "2.5D LineString": wkbLineString25D,
  */
   __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_GEOMETRY_TYPE_CODES); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 49, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
@@ -4268,9 +4344,9 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":50
  * # add additional aliases from 2.5D format
  * GEOMETRY_TYPE_CODES.update({
- *     '2.5D Point': wkbPoint25D,             # <<<<<<<<<<<<<<
- *     '2.5D LineString': wkbLineString25D,
- *     '2.5D Polygon': wkbPolygon25D,
+ *     "2.5D Point": wkbPoint25D,             # <<<<<<<<<<<<<<
+ *     "2.5D LineString": wkbLineString25D,
+ *     "2.5D Polygon": wkbPolygon25D,
  */
   __pyx_t_2 = __Pyx_PyDict_NewPresized(7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 50, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
@@ -4281,10 +4357,10 @@ if (!__Pyx_RefNanny) {
 
   /* "pyogrio/_geometry.pyx":51
  * GEOMETRY_TYPE_CODES.update({
- *     '2.5D Point': wkbPoint25D,
- *     '2.5D LineString': wkbLineString25D,             # <<<<<<<<<<<<<<
- *     '2.5D Polygon': wkbPolygon25D,
- *     '2.5D MultiPoint': wkbMultiPoint25D,
+ *     "2.5D Point": wkbPoint25D,
+ *     "2.5D LineString": wkbLineString25D,             # <<<<<<<<<<<<<<
+ *     "2.5D Polygon": wkbPolygon25D,
+ *     "2.5D MultiPoint": wkbMultiPoint25D,
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineString25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 51, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4292,11 +4368,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":52
- *     '2.5D Point': wkbPoint25D,
- *     '2.5D LineString': wkbLineString25D,
- *     '2.5D Polygon': wkbPolygon25D,             # <<<<<<<<<<<<<<
- *     '2.5D MultiPoint': wkbMultiPoint25D,
- *     '2.5D MultiLineString': wkbMultiLineString25D,
+ *     "2.5D Point": wkbPoint25D,
+ *     "2.5D LineString": wkbLineString25D,
+ *     "2.5D Polygon": wkbPolygon25D,             # <<<<<<<<<<<<<<
+ *     "2.5D MultiPoint": wkbMultiPoint25D,
+ *     "2.5D MultiLineString": wkbMultiLineString25D,
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygon25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 52, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4304,11 +4380,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":53
- *     '2.5D LineString': wkbLineString25D,
- *     '2.5D Polygon': wkbPolygon25D,
- *     '2.5D MultiPoint': wkbMultiPoint25D,             # <<<<<<<<<<<<<<
- *     '2.5D MultiLineString': wkbMultiLineString25D,
- *     '2.5D MultiPolygon': wkbMultiPolygon25D,
+ *     "2.5D LineString": wkbLineString25D,
+ *     "2.5D Polygon": wkbPolygon25D,
+ *     "2.5D MultiPoint": wkbMultiPoint25D,             # <<<<<<<<<<<<<<
+ *     "2.5D MultiLineString": wkbMultiLineString25D,
+ *     "2.5D MultiPolygon": wkbMultiPolygon25D,
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPoint25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 53, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4316,11 +4392,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":54
- *     '2.5D Polygon': wkbPolygon25D,
- *     '2.5D MultiPoint': wkbMultiPoint25D,
- *     '2.5D MultiLineString': wkbMultiLineString25D,             # <<<<<<<<<<<<<<
- *     '2.5D MultiPolygon': wkbMultiPolygon25D,
- *     '2.5D GeometryCollection': wkbGeometryCollection25D
+ *     "2.5D Polygon": wkbPolygon25D,
+ *     "2.5D MultiPoint": wkbMultiPoint25D,
+ *     "2.5D MultiLineString": wkbMultiLineString25D,             # <<<<<<<<<<<<<<
+ *     "2.5D MultiPolygon": wkbMultiPolygon25D,
+ *     "2.5D GeometryCollection": wkbGeometryCollection25D
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineString25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 54, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4328,10 +4404,10 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":55
- *     '2.5D MultiPoint': wkbMultiPoint25D,
- *     '2.5D MultiLineString': wkbMultiLineString25D,
- *     '2.5D MultiPolygon': wkbMultiPolygon25D,             # <<<<<<<<<<<<<<
- *     '2.5D GeometryCollection': wkbGeometryCollection25D
+ *     "2.5D MultiPoint": wkbMultiPoint25D,
+ *     "2.5D MultiLineString": wkbMultiLineString25D,
+ *     "2.5D MultiPolygon": wkbMultiPolygon25D,             # <<<<<<<<<<<<<<
+ *     "2.5D GeometryCollection": wkbGeometryCollection25D
  * })
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygon25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 55, __pyx_L1_error)
@@ -4340,9 +4416,9 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":56
- *     '2.5D MultiLineString': wkbMultiLineString25D,
- *     '2.5D MultiPolygon': wkbMultiPolygon25D,
- *     '2.5D GeometryCollection': wkbGeometryCollection25D             # <<<<<<<<<<<<<<
+ *     "2.5D MultiLineString": wkbMultiLineString25D,
+ *     "2.5D MultiPolygon": wkbMultiPolygon25D,
+ *     "2.5D GeometryCollection": wkbGeometryCollection25D             # <<<<<<<<<<<<<<
  * })
  * 
  */
@@ -4355,8 +4431,8 @@ if (!__Pyx_RefNanny) {
  * 
  * # add additional aliases from 2.5D format
  * GEOMETRY_TYPE_CODES.update({             # <<<<<<<<<<<<<<
- *     '2.5D Point': wkbPoint25D,
- *     '2.5D LineString': wkbLineString25D,
+ *     "2.5D Point": wkbPoint25D,
+ *     "2.5D LineString": wkbLineString25D,
  */
   __pyx_t_7 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 49, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4368,8 +4444,8 @@ if (!__Pyx_RefNanny) {
  * 
  * # 2.5D also represented using negative numbers not enumerated above
  * GEOMETRY_TYPES.update({             # <<<<<<<<<<<<<<
- *     -2147483647: 'Point Z',
- *     -2147483646: 'LineString Z',
+ *     -2147483647: "Point Z",
+ *     -2147483646: "LineString Z",
  */
   __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_GEOMETRY_TYPES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 60, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4380,9 +4456,9 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":61
  * # 2.5D also represented using negative numbers not enumerated above
  * GEOMETRY_TYPES.update({
- *     -2147483647: 'Point Z',             # <<<<<<<<<<<<<<
- *     -2147483646: 'LineString Z',
- *     -2147483645: 'Polygon Z',
+ *     -2147483647: "Point Z",             # <<<<<<<<<<<<<<
+ *     -2147483646: "LineString Z",
+ *     -2147483645: "Polygon Z",
  */
   __pyx_t_7 = __Pyx_PyDict_NewPresized(7); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 61, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4398,8 +4474,8 @@ if (!__Pyx_RefNanny) {
  * 
  * # 2.5D also represented using negative numbers not enumerated above
  * GEOMETRY_TYPES.update({             # <<<<<<<<<<<<<<
- *     -2147483647: 'Point Z',
- *     -2147483646: 'LineString Z',
+ *     -2147483647: "Point Z",
+ *     -2147483646: "LineString Z",
  */
   __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 60, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -5912,6 +5988,106 @@ static PyObject *__Pyx_PyDict_GetItem(PyObject *d, PyObject* key) {
 }
 #endif
 
+/* TypeImport */
+#ifndef __PYX_HAVE_RT_ImportType_3_0_12
+#define __PYX_HAVE_RT_ImportType_3_0_12
+static PyTypeObject *__Pyx_ImportType_3_0_12(PyObject *module, const char *module_name, const char *class_name,
+    size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_12 check_size)
+{
+    PyObject *result = 0;
+    char warning[200];
+    Py_ssize_t basicsize;
+    Py_ssize_t itemsize;
+#if CYTHON_COMPILING_IN_LIMITED_API
+    PyObject *py_basicsize;
+    PyObject *py_itemsize;
+#endif
+    result = PyObject_GetAttrString(module, class_name);
+    if (!result)
+        goto bad;
+    if (!PyType_Check(result)) {
+        PyErr_Format(PyExc_TypeError,
+            "%.200s.%.200s is not a type object",
+            module_name, class_name);
+        goto bad;
+    }
+#if !CYTHON_COMPILING_IN_LIMITED_API
+    basicsize = ((PyTypeObject *)result)->tp_basicsize;
+    itemsize = ((PyTypeObject *)result)->tp_itemsize;
+#else
+    py_basicsize = PyObject_GetAttrString(result, "__basicsize__");
+    if (!py_basicsize)
+        goto bad;
+    basicsize = PyLong_AsSsize_t(py_basicsize);
+    Py_DECREF(py_basicsize);
+    py_basicsize = 0;
+    if (basicsize == (Py_ssize_t)-1 && PyErr_Occurred())
+        goto bad;
+    py_itemsize = PyObject_GetAttrString(result, "__itemsize__");
+    if (!py_itemsize)
+        goto bad;
+    itemsize = PyLong_AsSsize_t(py_itemsize);
+    Py_DECREF(py_itemsize);
+    py_itemsize = 0;
+    if (itemsize == (Py_ssize_t)-1 && PyErr_Occurred())
+        goto bad;
+#endif
+    if (itemsize) {
+        if (size % alignment) {
+            alignment = size % alignment;
+        }
+        if (itemsize < (Py_ssize_t)alignment)
+            itemsize = (Py_ssize_t)alignment;
+    }
+    if ((size_t)(basicsize + itemsize) < size) {
+        PyErr_Format(PyExc_ValueError,
+            "%.200s.%.200s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd from PyObject",
+            module_name, class_name, size, basicsize+itemsize);
+        goto bad;
+    }
+    if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_12 &&
+            ((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) {
+        PyErr_Format(PyExc_ValueError,
+            "%.200s.%.200s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd-%zd from PyObject",
+            module_name, class_name, size, basicsize, basicsize+itemsize);
+        goto bad;
+    }
+    else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_12 && (size_t)basicsize > size) {
+        PyOS_snprintf(warning, sizeof(warning),
+            "%s.%s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd from PyObject",
+            module_name, class_name, size, basicsize);
+        if (PyErr_WarnEx(NULL, warning, 0) < 0) goto bad;
+    }
+    return (PyTypeObject *)result;
+bad:
+    Py_XDECREF(result);
+    return NULL;
+}
+#endif
+
+/* GetVTable */
+static void* __Pyx_GetVtable(PyTypeObject *type) {
+    void* ptr;
+#if CYTHON_COMPILING_IN_LIMITED_API
+    PyObject *ob = PyObject_GetAttr((PyObject *)type, __pyx_n_s_pyx_vtable);
+#else
+    PyObject *ob = PyObject_GetItem(type->tp_dict, __pyx_n_s_pyx_vtable);
+#endif
+    if (!ob)
+        goto bad;
+    ptr = PyCapsule_GetPointer(ob, 0);
+    if (!ptr && !PyErr_Occurred())
+        PyErr_SetString(PyExc_RuntimeError, "invalid vtable found for imported type");
+    Py_DECREF(ob);
+    return ptr;
+bad:
+    Py_XDECREF(ob);
+    return NULL;
+}
+
 /* Import */
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level) {
     PyObject *module = 0;
@@ -6615,7 +6791,7 @@ static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) {
 #include "compile.h"
 #include "frameobject.h"
 #include "traceback.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
+#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif
@@ -6856,12 +7032,19 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_OGRwkbGeometryType(OGRwkbGeometr
         }
     }
     {
-        int one = 1; int little = (int)*(unsigned char *)&one;
         unsigned char *bytes = (unsigned char *)&value;
-#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000
+#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x030d00A4
+        if (is_unsigned) {
+            return PyLong_FromUnsignedNativeBytes(bytes, sizeof(value), -1);
+        } else {
+            return PyLong_FromNativeBytes(bytes, sizeof(value), -1);
+        }
+#elif !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000
+        int one = 1; int little = (int)*(unsigned char *)&one;
         return _PyLong_FromByteArray(bytes, sizeof(OGRwkbGeometryType),
                                      little, !is_unsigned);
 #else
+        int one = 1; int little = (int)*(unsigned char *)&one;
         PyObject *from_bytes, *result = NULL;
         PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
         from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes");
@@ -6911,151 +7094,174 @@ static CYTHON_INLINE OGRwkbGeometryType __Pyx_PyInt_As_OGRwkbGeometryType(PyObje
             }
             return (OGRwkbGeometryType) val;
         }
-    } else
+    }
 #endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
+    if (unlikely(!PyLong_Check(x))) {
+        OGRwkbGeometryType val;
+        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
+        if (!tmp) return (OGRwkbGeometryType) -1;
+        val = __Pyx_PyInt_As_OGRwkbGeometryType(tmp);
+        Py_DECREF(tmp);
+        return val;
+    }
+    if (is_unsigned) {
 #if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(OGRwkbGeometryType) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) >= 2 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) (((((OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0]));
-                            }
+        if (unlikely(__Pyx_PyLong_IsNeg(x))) {
+            goto raise_neg_overflow;
+        } else if (__Pyx_PyLong_IsCompact(x)) {
+            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
+        } else {
+            const digit* digits = __Pyx_PyLong_Digits(x);
+            assert(__Pyx_PyLong_DigitCount(x) > 1);
+            switch (__Pyx_PyLong_DigitCount(x)) {
+                case 2:
+                    if ((8 * sizeof(OGRwkbGeometryType) > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) >= 2 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) (((((OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0]));
                         }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(OGRwkbGeometryType) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) >= 3 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) (((((((OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0]));
-                            }
+                    }
+                    break;
+                case 3:
+                    if ((8 * sizeof(OGRwkbGeometryType) > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) >= 3 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) (((((((OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0]));
                         }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(OGRwkbGeometryType) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) >= 4 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) (((((((((OGRwkbGeometryType)digits[3]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0]));
-                            }
+                    }
+                    break;
+                case 4:
+                    if ((8 * sizeof(OGRwkbGeometryType) > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) >= 4 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) (((((((((OGRwkbGeometryType)digits[3]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0]));
                         }
-                        break;
-                }
+                    }
+                    break;
             }
+        }
 #endif
 #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
+        if (unlikely(Py_SIZE(x) < 0)) {
+            goto raise_neg_overflow;
+        }
 #else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (OGRwkbGeometryType) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
+        {
+            int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
+            if (unlikely(result < 0))
+                return (OGRwkbGeometryType) -1;
+            if (unlikely(result == 1))
+                goto raise_neg_overflow;
+        }
 #endif
-            if ((sizeof(OGRwkbGeometryType) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(OGRwkbGeometryType, unsigned long, PyLong_AsUnsignedLong(x))
+        if ((sizeof(OGRwkbGeometryType) <= sizeof(unsigned long))) {
+            __PYX_VERIFY_RETURN_INT_EXC(OGRwkbGeometryType, unsigned long, PyLong_AsUnsignedLong(x))
 #ifdef HAVE_LONG_LONG
-            } else if ((sizeof(OGRwkbGeometryType) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(OGRwkbGeometryType, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
+        } else if ((sizeof(OGRwkbGeometryType) <= sizeof(unsigned PY_LONG_LONG))) {
+            __PYX_VERIFY_RETURN_INT_EXC(OGRwkbGeometryType, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
 #endif
-            }
-        } else {
+        }
+    } else {
 #if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(OGRwkbGeometryType) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 2 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) (((OGRwkbGeometryType)-1)*(((((OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
-                            }
+        if (__Pyx_PyLong_IsCompact(x)) {
+            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
+        } else {
+            const digit* digits = __Pyx_PyLong_Digits(x);
+            assert(__Pyx_PyLong_DigitCount(x) > 1);
+            switch (__Pyx_PyLong_SignedDigitCount(x)) {
+                case -2:
+                    if ((8 * sizeof(OGRwkbGeometryType) - 1 > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 2 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) (((OGRwkbGeometryType)-1)*(((((OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
                         }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(OGRwkbGeometryType) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 2 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) ((((((OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
-                            }
+                    }
+                    break;
+                case 2:
+                    if ((8 * sizeof(OGRwkbGeometryType) > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 2 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) ((((((OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
                         }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(OGRwkbGeometryType) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 3 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) (((OGRwkbGeometryType)-1)*(((((((OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
-                            }
+                    }
+                    break;
+                case -3:
+                    if ((8 * sizeof(OGRwkbGeometryType) - 1 > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 3 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) (((OGRwkbGeometryType)-1)*(((((((OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
                         }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(OGRwkbGeometryType) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 3 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) ((((((((OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
-                            }
+                    }
+                    break;
+                case 3:
+                    if ((8 * sizeof(OGRwkbGeometryType) > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 3 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) ((((((((OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
                         }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(OGRwkbGeometryType) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 4 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) (((OGRwkbGeometryType)-1)*(((((((((OGRwkbGeometryType)digits[3]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
-                            }
+                    }
+                    break;
+                case -4:
+                    if ((8 * sizeof(OGRwkbGeometryType) - 1 > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 4 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) (((OGRwkbGeometryType)-1)*(((((((((OGRwkbGeometryType)digits[3]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
                         }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(OGRwkbGeometryType) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 4 * PyLong_SHIFT)) {
-                                return (OGRwkbGeometryType) ((((((((((OGRwkbGeometryType)digits[3]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
-                            }
+                    }
+                    break;
+                case 4:
+                    if ((8 * sizeof(OGRwkbGeometryType) > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(OGRwkbGeometryType, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(OGRwkbGeometryType) - 1 > 4 * PyLong_SHIFT)) {
+                            return (OGRwkbGeometryType) ((((((((((OGRwkbGeometryType)digits[3]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[2]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[1]) << PyLong_SHIFT) | (OGRwkbGeometryType)digits[0])));
                         }
-                        break;
-                }
+                    }
+                    break;
             }
+        }
 #endif
-            if ((sizeof(OGRwkbGeometryType) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(OGRwkbGeometryType, long, PyLong_AsLong(x))
+        if ((sizeof(OGRwkbGeometryType) <= sizeof(long))) {
+            __PYX_VERIFY_RETURN_INT_EXC(OGRwkbGeometryType, long, PyLong_AsLong(x))
 #ifdef HAVE_LONG_LONG
-            } else if ((sizeof(OGRwkbGeometryType) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(OGRwkbGeometryType, PY_LONG_LONG, PyLong_AsLongLong(x))
+        } else if ((sizeof(OGRwkbGeometryType) <= sizeof(PY_LONG_LONG))) {
+            __PYX_VERIFY_RETURN_INT_EXC(OGRwkbGeometryType, PY_LONG_LONG, PyLong_AsLongLong(x))
 #endif
-            }
         }
-        PyErr_SetString(PyExc_RuntimeError,
-                        "_PyLong_AsByteArray() not available, cannot convert large enums");
-        return (OGRwkbGeometryType) -1;
-    } else {
+    }
+    {
         OGRwkbGeometryType val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (OGRwkbGeometryType) -1;
-        val = __Pyx_PyInt_As_OGRwkbGeometryType(tmp);
-        Py_DECREF(tmp);
+        int ret = -1;
+#if PY_VERSION_HEX >= 0x030d00A6 && !CYTHON_COMPILING_IN_LIMITED_API
+        Py_ssize_t bytes_copied = PyLong_AsNativeBytes(
+            x, &val, sizeof(val), Py_ASNATIVEBYTES_NATIVE_ENDIAN | (is_unsigned ? Py_ASNATIVEBYTES_UNSIGNED_BUFFER | Py_ASNATIVEBYTES_REJECT_NEGATIVE : 0));
+        if (unlikely(bytes_copied == -1)) {
+        } else if (unlikely(bytes_copied > (Py_ssize_t) sizeof(val))) {
+            goto raise_overflow;
+        } else {
+            ret = 0;
+        }
+#elif PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
+        int one = 1; int is_little = (int)*(unsigned char *)&one;
+        unsigned char *bytes = (unsigned char *)&val;
+        ret = _PyLong_AsByteArray((PyLongObject *)x,
+                                    bytes, sizeof(val),
+                                    is_little, !is_unsigned);
+#else
+        PyErr_SetString(PyExc_RuntimeError,
+                        "_PyLong_AsByteArray() or PyLong_AsNativeBytes() not available, cannot convert large enums");
+        val = (OGRwkbGeometryType) -1;
+#endif
+        if (unlikely(ret))
+            return (OGRwkbGeometryType) -1;
         return val;
     }
 raise_overflow:
@@ -7115,12 +7321,19 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) {
         }
     }
     {
-        int one = 1; int little = (int)*(unsigned char *)&one;
         unsigned char *bytes = (unsigned char *)&value;
-#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000
+#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x030d00A4
+        if (is_unsigned) {
+            return PyLong_FromUnsignedNativeBytes(bytes, sizeof(value), -1);
+        } else {
+            return PyLong_FromNativeBytes(bytes, sizeof(value), -1);
+        }
+#elif !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000
+        int one = 1; int little = (int)*(unsigned char *)&one;
         return _PyLong_FromByteArray(bytes, sizeof(long),
                                      little, !is_unsigned);
 #else
+        int one = 1; int little = (int)*(unsigned char *)&one;
         PyObject *from_bytes, *result = NULL;
         PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
         from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes");
@@ -7170,245 +7383,239 @@ static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) {
             }
             return (long) val;
         }
-    } else
+    }
 #endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
+    if (unlikely(!PyLong_Check(x))) {
+        long val;
+        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
+        if (!tmp) return (long) -1;
+        val = __Pyx_PyInt_As_long(tmp);
+        Py_DECREF(tmp);
+        return val;
+    }
+    if (is_unsigned) {
 #if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) >= 2 * PyLong_SHIFT)) {
-                                return (long) (((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
-                            }
+        if (unlikely(__Pyx_PyLong_IsNeg(x))) {
+            goto raise_neg_overflow;
+        } else if (__Pyx_PyLong_IsCompact(x)) {
+            __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
+        } else {
+            const digit* digits = __Pyx_PyLong_Digits(x);
+            assert(__Pyx_PyLong_DigitCount(x) > 1);
+            switch (__Pyx_PyLong_DigitCount(x)) {
+                case 2:
+                    if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) >= 2 * PyLong_SHIFT)) {
+                            return (long) (((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
                         }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) >= 3 * PyLong_SHIFT)) {
-                                return (long) (((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
-                            }
+                    }
+                    break;
+                case 3:
+                    if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) >= 3 * PyLong_SHIFT)) {
+                            return (long) (((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
                         }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) >= 4 * PyLong_SHIFT)) {
-                                return (long) (((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
-                            }
+                    }
+                    break;
+                case 4:
+                    if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) >= 4 * PyLong_SHIFT)) {
+                            return (long) (((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
                         }
-                        break;
-                }
+                    }
+                    break;
             }
+        }
 #endif
 #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
+        if (unlikely(Py_SIZE(x) < 0)) {
+            goto raise_neg_overflow;
+        }
 #else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (long) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
+        {
+            int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
+            if (unlikely(result < 0))
+                return (long) -1;
+            if (unlikely(result == 1))
+                goto raise_neg_overflow;
+        }
 #endif
-            if ((sizeof(long) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(long, unsigned long, PyLong_AsUnsignedLong(x))
+        if ((sizeof(long) <= sizeof(unsigned long))) {
+            __PYX_VERIFY_RETURN_INT_EXC(long, unsigned long, PyLong_AsUnsignedLong(x))
 #ifdef HAVE_LONG_LONG
-            } else if ((sizeof(long) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(long, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
+        } else if ((sizeof(long) <= sizeof(unsigned PY_LONG_LONG))) {
+            __PYX_VERIFY_RETURN_INT_EXC(long, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
 #endif
-            }
-        } else {
+        }
+    } else {
 #if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(long) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
-                                return (long) (((long)-1)*(((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
+        if (__Pyx_PyLong_IsCompact(x)) {
+            __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
+        } else {
+            const digit* digits = __Pyx_PyLong_Digits(x);
+            assert(__Pyx_PyLong_DigitCount(x) > 1);
+            switch (__Pyx_PyLong_SignedDigitCount(x)) {
+                case -2:
+                    if ((8 * sizeof(long) - 1 > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
+                            return (long) (((long)-1)*(((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
                         }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
-                                return (long) ((((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
+                    }
+                    break;
+                case 2:
+                    if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
+                            return (long) ((((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
                         }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
-                                return (long) (((long)-1)*(((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
+                    }
+                    break;
+                case -3:
+                    if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
+                            return (long) (((long)-1)*(((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
                         }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
-                                return (long) ((((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
+                    }
+                    break;
+                case 3:
+                    if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
+                            return (long) ((((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
                         }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) {
-                                return (long) (((long)-1)*(((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
+                    }
+                    break;
+                case -4:
+                    if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) {
+                            return (long) (((long)-1)*(((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
                         }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) {
-                                return (long) ((((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
+                    }
+                    break;
+                case 4:
+                    if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) {
+                            return (long) ((((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
                         }
-                        break;
-                }
+                    }
+                    break;
             }
+        }
 #endif
-            if ((sizeof(long) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(long, long, PyLong_AsLong(x))
+        if ((sizeof(long) <= sizeof(long))) {
+            __PYX_VERIFY_RETURN_INT_EXC(long, long, PyLong_AsLong(x))
 #ifdef HAVE_LONG_LONG
-            } else if ((sizeof(long) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(long, PY_LONG_LONG, PyLong_AsLongLong(x))
+        } else if ((sizeof(long) <= sizeof(PY_LONG_LONG))) {
+            __PYX_VERIFY_RETURN_INT_EXC(long, PY_LONG_LONG, PyLong_AsLongLong(x))
 #endif
-            }
+        }
+    }
+    {
+        long val;
+        int ret = -1;
+#if PY_VERSION_HEX >= 0x030d00A6 && !CYTHON_COMPILING_IN_LIMITED_API
+        Py_ssize_t bytes_copied = PyLong_AsNativeBytes(
+            x, &val, sizeof(val), Py_ASNATIVEBYTES_NATIVE_ENDIAN | (is_unsigned ? Py_ASNATIVEBYTES_UNSIGNED_BUFFER | Py_ASNATIVEBYTES_REJECT_NEGATIVE : 0));
+        if (unlikely(bytes_copied == -1)) {
+        } else if (unlikely(bytes_copied > (Py_ssize_t) sizeof(val))) {
+            goto raise_overflow;
+        } else {
+            ret = 0;
+        }
+#elif PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
+        int one = 1; int is_little = (int)*(unsigned char *)&one;
+        unsigned char *bytes = (unsigned char *)&val;
+        ret = _PyLong_AsByteArray((PyLongObject *)x,
+                                    bytes, sizeof(val),
+                                    is_little, !is_unsigned);
+#else
+        PyObject *v;
+        PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
+        int bits, remaining_bits, is_negative = 0;
+        int chunk_size = (sizeof(long) < 8) ? 30 : 62;
+        if (likely(PyLong_CheckExact(x))) {
+            v = __Pyx_NewRef(x);
+        } else {
+            v = PyNumber_Long(x);
+            if (unlikely(!v)) return (long) -1;
+            assert(PyLong_CheckExact(v));
         }
         {
-            long val;
-            PyObject *v = __Pyx_PyNumber_IntOrLong(x);
-#if PY_MAJOR_VERSION < 3
-            if (likely(v) && !PyLong_Check(v)) {
-                PyObject *tmp = v;
-                v = PyNumber_Long(tmp);
-                Py_DECREF(tmp);
-            }
-#endif
-            if (likely(v)) {
-                int ret = -1;
-#if PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
-                int one = 1; int is_little = (int)*(unsigned char *)&one;
-                unsigned char *bytes = (unsigned char *)&val;
-                ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                           bytes, sizeof(val),
-                                           is_little, !is_unsigned);
-#else
-                PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
-                int bits, remaining_bits, is_negative = 0;
-                long idigit;
-                int chunk_size = (sizeof(long) < 8) ? 30 : 62;
-                if (unlikely(!PyLong_CheckExact(v))) {
-                    PyObject *tmp = v;
-                    v = PyNumber_Long(v);
-                    assert(PyLong_CheckExact(v));
-                    Py_DECREF(tmp);
-                    if (unlikely(!v)) return (long) -1;
-                }
-#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                if (Py_SIZE(x) == 0)
-                    return (long) 0;
-                is_negative = Py_SIZE(x) < 0;
-#else
-                {
-                    int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                    if (unlikely(result < 0))
-                        return (long) -1;
-                    is_negative = result == 1;
-                }
-#endif
-                if (is_unsigned && unlikely(is_negative)) {
-                    goto raise_neg_overflow;
-                } else if (is_negative) {
-                    stepval = PyNumber_Invert(v);
-                    if (unlikely(!stepval))
-                        return (long) -1;
-                } else {
-                    stepval = __Pyx_NewRef(v);
-                }
-                val = (long) 0;
-                mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
-                shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
-                for (bits = 0; bits < (int) sizeof(long) * 8 - chunk_size; bits += chunk_size) {
-                    PyObject *tmp, *digit;
-                    digit = PyNumber_And(stepval, mask);
-                    if (unlikely(!digit)) goto done;
-                    idigit = PyLong_AsLong(digit);
-                    Py_DECREF(digit);
-                    if (unlikely(idigit < 0)) goto done;
-                    tmp = PyNumber_Rshift(stepval, shift);
-                    if (unlikely(!tmp)) goto done;
-                    Py_DECREF(stepval); stepval = tmp;
-                    val |= ((long) idigit) << bits;
-                    #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                    if (Py_SIZE(stepval) == 0)
-                        goto unpacking_done;
-                    #endif
-                }
-                idigit = PyLong_AsLong(stepval);
-                if (unlikely(idigit < 0)) goto done;
-                remaining_bits = ((int) sizeof(long) * 8) - bits - (is_unsigned ? 0 : 1);
-                if (unlikely(idigit >= (1L << remaining_bits)))
-                    goto raise_overflow;
-                val |= ((long) idigit) << bits;
-            #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-            unpacking_done:
-            #endif
-                if (!is_unsigned) {
-                    if (unlikely(val & (((long) 1) << (sizeof(long) * 8 - 1))))
-                        goto raise_overflow;
-                    if (is_negative)
-                        val = ~val;
-                }
-                ret = 0;
-            done:
-                Py_XDECREF(shift);
-                Py_XDECREF(mask);
-                Py_XDECREF(stepval);
-#endif
+            int result = PyObject_RichCompareBool(v, Py_False, Py_LT);
+            if (unlikely(result < 0)) {
                 Py_DECREF(v);
-                if (likely(!ret))
-                    return val;
+                return (long) -1;
             }
-            return (long) -1;
+            is_negative = result == 1;
         }
-    } else {
-        long val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (long) -1;
-        val = __Pyx_PyInt_As_long(tmp);
-        Py_DECREF(tmp);
+        if (is_unsigned && unlikely(is_negative)) {
+            Py_DECREF(v);
+            goto raise_neg_overflow;
+        } else if (is_negative) {
+            stepval = PyNumber_Invert(v);
+            Py_DECREF(v);
+            if (unlikely(!stepval))
+                return (long) -1;
+        } else {
+            stepval = v;
+        }
+        v = NULL;
+        val = (long) 0;
+        mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
+        shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
+        for (bits = 0; bits < (int) sizeof(long) * 8 - chunk_size; bits += chunk_size) {
+            PyObject *tmp, *digit;
+            long idigit;
+            digit = PyNumber_And(stepval, mask);
+            if (unlikely(!digit)) goto done;
+            idigit = PyLong_AsLong(digit);
+            Py_DECREF(digit);
+            if (unlikely(idigit < 0)) goto done;
+            val |= ((long) idigit) << bits;
+            tmp = PyNumber_Rshift(stepval, shift);
+            if (unlikely(!tmp)) goto done;
+            Py_DECREF(stepval); stepval = tmp;
+        }
+        Py_DECREF(shift); shift = NULL;
+        Py_DECREF(mask); mask = NULL;
+        {
+            long idigit = PyLong_AsLong(stepval);
+            if (unlikely(idigit < 0)) goto done;
+            remaining_bits = ((int) sizeof(long) * 8) - bits - (is_unsigned ? 0 : 1);
+            if (unlikely(idigit >= (1L << remaining_bits)))
+                goto raise_overflow;
+            val |= ((long) idigit) << bits;
+        }
+        if (!is_unsigned) {
+            if (unlikely(val & (((long) 1) << (sizeof(long) * 8 - 1))))
+                goto raise_overflow;
+            if (is_negative)
+                val = ~val;
+        }
+        ret = 0;
+    done:
+        Py_XDECREF(shift);
+        Py_XDECREF(mask);
+        Py_XDECREF(stepval);
+#endif
+        if (unlikely(ret))
+            return (long) -1;
         return val;
     }
 raise_overflow:
@@ -7443,245 +7650,239 @@ static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {
             }
             return (int) val;
         }
-    } else
+    }
 #endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
+    if (unlikely(!PyLong_Check(x))) {
+        int val;
+        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
+        if (!tmp) return (int) -1;
+        val = __Pyx_PyInt_As_int(tmp);
+        Py_DECREF(tmp);
+        return val;
+    }
+    if (is_unsigned) {
 #if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) >= 2 * PyLong_SHIFT)) {
-                                return (int) (((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
-                            }
+        if (unlikely(__Pyx_PyLong_IsNeg(x))) {
+            goto raise_neg_overflow;
+        } else if (__Pyx_PyLong_IsCompact(x)) {
+            __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
+        } else {
+            const digit* digits = __Pyx_PyLong_Digits(x);
+            assert(__Pyx_PyLong_DigitCount(x) > 1);
+            switch (__Pyx_PyLong_DigitCount(x)) {
+                case 2:
+                    if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) >= 2 * PyLong_SHIFT)) {
+                            return (int) (((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
                         }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) >= 3 * PyLong_SHIFT)) {
-                                return (int) (((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
-                            }
+                    }
+                    break;
+                case 3:
+                    if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) >= 3 * PyLong_SHIFT)) {
+                            return (int) (((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
                         }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) >= 4 * PyLong_SHIFT)) {
-                                return (int) (((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
-                            }
+                    }
+                    break;
+                case 4:
+                    if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) >= 4 * PyLong_SHIFT)) {
+                            return (int) (((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
                         }
-                        break;
-                }
+                    }
+                    break;
             }
+        }
 #endif
 #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
+        if (unlikely(Py_SIZE(x) < 0)) {
+            goto raise_neg_overflow;
+        }
 #else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (int) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
+        {
+            int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
+            if (unlikely(result < 0))
+                return (int) -1;
+            if (unlikely(result == 1))
+                goto raise_neg_overflow;
+        }
 #endif
-            if ((sizeof(int) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long, PyLong_AsUnsignedLong(x))
+        if ((sizeof(int) <= sizeof(unsigned long))) {
+            __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long, PyLong_AsUnsignedLong(x))
 #ifdef HAVE_LONG_LONG
-            } else if ((sizeof(int) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
+        } else if ((sizeof(int) <= sizeof(unsigned PY_LONG_LONG))) {
+            __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
 #endif
-            }
-        } else {
+        }
+    } else {
 #if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(int) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
-                                return (int) (((int)-1)*(((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
+        if (__Pyx_PyLong_IsCompact(x)) {
+            __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
+        } else {
+            const digit* digits = __Pyx_PyLong_Digits(x);
+            assert(__Pyx_PyLong_DigitCount(x) > 1);
+            switch (__Pyx_PyLong_SignedDigitCount(x)) {
+                case -2:
+                    if ((8 * sizeof(int) - 1 > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
+                            return (int) (((int)-1)*(((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
                         }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
-                                return (int) ((((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
+                    }
+                    break;
+                case 2:
+                    if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
+                            return (int) ((((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
                         }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
-                                return (int) (((int)-1)*(((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
+                    }
+                    break;
+                case -3:
+                    if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
+                            return (int) (((int)-1)*(((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
                         }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
-                                return (int) ((((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
+                    }
+                    break;
+                case 3:
+                    if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
+                            return (int) ((((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
                         }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) {
-                                return (int) (((int)-1)*(((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
+                    }
+                    break;
+                case -4:
+                    if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) {
+                            return (int) (((int)-1)*(((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
                         }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) {
-                                return (int) ((((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
+                    }
+                    break;
+                case 4:
+                    if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) {
+                        if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
+                            __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+                        } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) {
+                            return (int) ((((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
                         }
-                        break;
-                }
+                    }
+                    break;
             }
+        }
 #endif
-            if ((sizeof(int) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x))
+        if ((sizeof(int) <= sizeof(long))) {
+            __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x))
 #ifdef HAVE_LONG_LONG
-            } else if ((sizeof(int) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG, PyLong_AsLongLong(x))
+        } else if ((sizeof(int) <= sizeof(PY_LONG_LONG))) {
+            __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG, PyLong_AsLongLong(x))
 #endif
-            }
+        }
+    }
+    {
+        int val;
+        int ret = -1;
+#if PY_VERSION_HEX >= 0x030d00A6 && !CYTHON_COMPILING_IN_LIMITED_API
+        Py_ssize_t bytes_copied = PyLong_AsNativeBytes(
+            x, &val, sizeof(val), Py_ASNATIVEBYTES_NATIVE_ENDIAN | (is_unsigned ? Py_ASNATIVEBYTES_UNSIGNED_BUFFER | Py_ASNATIVEBYTES_REJECT_NEGATIVE : 0));
+        if (unlikely(bytes_copied == -1)) {
+        } else if (unlikely(bytes_copied > (Py_ssize_t) sizeof(val))) {
+            goto raise_overflow;
+        } else {
+            ret = 0;
+        }
+#elif PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
+        int one = 1; int is_little = (int)*(unsigned char *)&one;
+        unsigned char *bytes = (unsigned char *)&val;
+        ret = _PyLong_AsByteArray((PyLongObject *)x,
+                                    bytes, sizeof(val),
+                                    is_little, !is_unsigned);
+#else
+        PyObject *v;
+        PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
+        int bits, remaining_bits, is_negative = 0;
+        int chunk_size = (sizeof(long) < 8) ? 30 : 62;
+        if (likely(PyLong_CheckExact(x))) {
+            v = __Pyx_NewRef(x);
+        } else {
+            v = PyNumber_Long(x);
+            if (unlikely(!v)) return (int) -1;
+            assert(PyLong_CheckExact(v));
         }
         {
-            int val;
-            PyObject *v = __Pyx_PyNumber_IntOrLong(x);
-#if PY_MAJOR_VERSION < 3
-            if (likely(v) && !PyLong_Check(v)) {
-                PyObject *tmp = v;
-                v = PyNumber_Long(tmp);
-                Py_DECREF(tmp);
-            }
-#endif
-            if (likely(v)) {
-                int ret = -1;
-#if PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
-                int one = 1; int is_little = (int)*(unsigned char *)&one;
-                unsigned char *bytes = (unsigned char *)&val;
-                ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                           bytes, sizeof(val),
-                                           is_little, !is_unsigned);
-#else
-                PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
-                int bits, remaining_bits, is_negative = 0;
-                long idigit;
-                int chunk_size = (sizeof(long) < 8) ? 30 : 62;
-                if (unlikely(!PyLong_CheckExact(v))) {
-                    PyObject *tmp = v;
-                    v = PyNumber_Long(v);
-                    assert(PyLong_CheckExact(v));
-                    Py_DECREF(tmp);
-                    if (unlikely(!v)) return (int) -1;
-                }
-#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                if (Py_SIZE(x) == 0)
-                    return (int) 0;
-                is_negative = Py_SIZE(x) < 0;
-#else
-                {
-                    int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                    if (unlikely(result < 0))
-                        return (int) -1;
-                    is_negative = result == 1;
-                }
-#endif
-                if (is_unsigned && unlikely(is_negative)) {
-                    goto raise_neg_overflow;
-                } else if (is_negative) {
-                    stepval = PyNumber_Invert(v);
-                    if (unlikely(!stepval))
-                        return (int) -1;
-                } else {
-                    stepval = __Pyx_NewRef(v);
-                }
-                val = (int) 0;
-                mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
-                shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
-                for (bits = 0; bits < (int) sizeof(int) * 8 - chunk_size; bits += chunk_size) {
-                    PyObject *tmp, *digit;
-                    digit = PyNumber_And(stepval, mask);
-                    if (unlikely(!digit)) goto done;
-                    idigit = PyLong_AsLong(digit);
-                    Py_DECREF(digit);
-                    if (unlikely(idigit < 0)) goto done;
-                    tmp = PyNumber_Rshift(stepval, shift);
-                    if (unlikely(!tmp)) goto done;
-                    Py_DECREF(stepval); stepval = tmp;
-                    val |= ((int) idigit) << bits;
-                    #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                    if (Py_SIZE(stepval) == 0)
-                        goto unpacking_done;
-                    #endif
-                }
-                idigit = PyLong_AsLong(stepval);
-                if (unlikely(idigit < 0)) goto done;
-                remaining_bits = ((int) sizeof(int) * 8) - bits - (is_unsigned ? 0 : 1);
-                if (unlikely(idigit >= (1L << remaining_bits)))
-                    goto raise_overflow;
-                val |= ((int) idigit) << bits;
-            #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-            unpacking_done:
-            #endif
-                if (!is_unsigned) {
-                    if (unlikely(val & (((int) 1) << (sizeof(int) * 8 - 1))))
-                        goto raise_overflow;
-                    if (is_negative)
-                        val = ~val;
-                }
-                ret = 0;
-            done:
-                Py_XDECREF(shift);
-                Py_XDECREF(mask);
-                Py_XDECREF(stepval);
-#endif
+            int result = PyObject_RichCompareBool(v, Py_False, Py_LT);
+            if (unlikely(result < 0)) {
                 Py_DECREF(v);
-                if (likely(!ret))
-                    return val;
+                return (int) -1;
             }
-            return (int) -1;
+            is_negative = result == 1;
         }
-    } else {
-        int val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (int) -1;
-        val = __Pyx_PyInt_As_int(tmp);
-        Py_DECREF(tmp);
+        if (is_unsigned && unlikely(is_negative)) {
+            Py_DECREF(v);
+            goto raise_neg_overflow;
+        } else if (is_negative) {
+            stepval = PyNumber_Invert(v);
+            Py_DECREF(v);
+            if (unlikely(!stepval))
+                return (int) -1;
+        } else {
+            stepval = v;
+        }
+        v = NULL;
+        val = (int) 0;
+        mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
+        shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
+        for (bits = 0; bits < (int) sizeof(int) * 8 - chunk_size; bits += chunk_size) {
+            PyObject *tmp, *digit;
+            long idigit;
+            digit = PyNumber_And(stepval, mask);
+            if (unlikely(!digit)) goto done;
+            idigit = PyLong_AsLong(digit);
+            Py_DECREF(digit);
+            if (unlikely(idigit < 0)) goto done;
+            val |= ((int) idigit) << bits;
+            tmp = PyNumber_Rshift(stepval, shift);
+            if (unlikely(!tmp)) goto done;
+            Py_DECREF(stepval); stepval = tmp;
+        }
+        Py_DECREF(shift); shift = NULL;
+        Py_DECREF(mask); mask = NULL;
+        {
+            long idigit = PyLong_AsLong(stepval);
+            if (unlikely(idigit < 0)) goto done;
+            remaining_bits = ((int) sizeof(int) * 8) - bits - (is_unsigned ? 0 : 1);
+            if (unlikely(idigit >= (1L << remaining_bits)))
+                goto raise_overflow;
+            val |= ((int) idigit) << bits;
+        }
+        if (!is_unsigned) {
+            if (unlikely(val & (((int) 1) << (sizeof(int) * 8 - 1))))
+                goto raise_overflow;
+            if (is_negative)
+                val = ~val;
+        }
+        ret = 0;
+    done:
+        Py_XDECREF(shift);
+        Py_XDECREF(mask);
+        Py_XDECREF(stepval);
+#endif
+        if (unlikely(ret))
+            return (int) -1;
         return val;
     }
 raise_overflow:
@@ -7775,9 +7976,9 @@ bad:
 }
 
 /* FunctionImport */
-#ifndef __PYX_HAVE_RT_ImportFunction_3_0_10
-#define __PYX_HAVE_RT_ImportFunction_3_0_10
-static int __Pyx_ImportFunction_3_0_10(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
+#ifndef __PYX_HAVE_RT_ImportFunction_3_0_12
+#define __PYX_HAVE_RT_ImportFunction_3_0_12
+static int __Pyx_ImportFunction_3_0_12(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
     PyObject *d = 0;
     PyObject *cobj = 0;
     union {