pyogrio 0.7.2__cp310-cp310-win_amd64.whl → 0.9.0__cp310-cp310-win_amd64.whl

pyogrio/_err.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 3.0.4 */
+/* Generated by Cython 3.0.10 */
 
 /* BEGIN: Cython Metadata
 {
@@ -57,10 +57,10 @@ END: Cython Metadata */
 #else
 #define __PYX_EXTRA_ABI_MODULE_NAME ""
 #endif
-#define CYTHON_ABI "3_0_4" __PYX_EXTRA_ABI_MODULE_NAME
+#define CYTHON_ABI "3_0_10" __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 0x030004F0
+#define CYTHON_HEX_VERSION 0x03000AF0
 #define CYTHON_FUTURE_DIVISION 1
 #include <stddef.h>
 #ifndef offsetof
@@ -152,6 +152,8 @@ END: Cython Metadata */
   #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
     #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
   #endif
+  #undef CYTHON_USE_FREELISTS
+  #define CYTHON_USE_FREELISTS 0
 #elif defined(PYPY_VERSION)
   #define CYTHON_COMPILING_IN_PYPY 1
   #define CYTHON_COMPILING_IN_CPYTHON 0
@@ -213,6 +215,8 @@ END: Cython Metadata */
   #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
     #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
   #endif
+  #undef CYTHON_USE_FREELISTS
+  #define CYTHON_USE_FREELISTS 0
 #elif defined(CYTHON_LIMITED_API)
   #ifdef Py_LIMITED_API
     #undef __PYX_LIMITED_VERSION_HEX
@@ -274,7 +278,9 @@ END: Cython Metadata */
   #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
     #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
   #endif
-#elif defined(PY_NOGIL)
+  #undef CYTHON_USE_FREELISTS
+  #define CYTHON_USE_FREELISTS 0
+#elif defined(Py_GIL_DISABLED) || defined(Py_NOGIL)
   #define CYTHON_COMPILING_IN_PYPY 0
   #define CYTHON_COMPILING_IN_CPYTHON 0
   #define CYTHON_COMPILING_IN_LIMITED_API 0
@@ -283,11 +289,17 @@ END: Cython Metadata */
   #ifndef CYTHON_USE_TYPE_SLOTS
     #define CYTHON_USE_TYPE_SLOTS 1
   #endif
+  #ifndef CYTHON_USE_TYPE_SPECS
+    #define CYTHON_USE_TYPE_SPECS 0
+  #endif
   #undef CYTHON_USE_PYTYPE_LOOKUP
   #define CYTHON_USE_PYTYPE_LOOKUP 0
   #ifndef CYTHON_USE_ASYNC_SLOTS
     #define CYTHON_USE_ASYNC_SLOTS 1
   #endif
+  #ifndef CYTHON_USE_PYLONG_INTERNALS
+    #define CYTHON_USE_PYLONG_INTERNALS 0
+  #endif
   #undef CYTHON_USE_PYLIST_INTERNALS
   #define CYTHON_USE_PYLIST_INTERNALS 0
   #ifndef CYTHON_USE_UNICODE_INTERNALS
@@ -295,8 +307,6 @@ END: Cython Metadata */
   #endif
   #undef CYTHON_USE_UNICODE_WRITER
   #define CYTHON_USE_UNICODE_WRITER 0
-  #undef CYTHON_USE_PYLONG_INTERNALS
-  #define CYTHON_USE_PYLONG_INTERNALS 0
   #ifndef CYTHON_AVOID_BORROWED_REFS
     #define CYTHON_AVOID_BORROWED_REFS 0
   #endif
@@ -308,11 +318,22 @@ END: Cython Metadata */
   #endif
   #undef CYTHON_FAST_THREAD_STATE
   #define CYTHON_FAST_THREAD_STATE 0
+  #undef CYTHON_FAST_GIL
+  #define CYTHON_FAST_GIL 0
+  #ifndef CYTHON_METH_FASTCALL
+    #define CYTHON_METH_FASTCALL 1
+  #endif
   #undef CYTHON_FAST_PYCALL
   #define CYTHON_FAST_PYCALL 0
+  #ifndef CYTHON_PEP487_INIT_SUBCLASS
+    #define CYTHON_PEP487_INIT_SUBCLASS 1
+  #endif
   #ifndef CYTHON_PEP489_MULTI_PHASE_INIT
     #define CYTHON_PEP489_MULTI_PHASE_INIT 1
   #endif
+  #ifndef CYTHON_USE_MODULE_STATE
+    #define CYTHON_USE_MODULE_STATE 0
+  #endif
   #ifndef CYTHON_USE_TP_FINALIZE
     #define CYTHON_USE_TP_FINALIZE 1
   #endif
@@ -320,6 +341,12 @@ END: Cython Metadata */
   #define CYTHON_USE_DICT_VERSIONS 0
   #undef CYTHON_USE_EXC_INFO_STACK
   #define CYTHON_USE_EXC_INFO_STACK 0
+  #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
+    #define CYTHON_UPDATE_DESCRIPTOR_DOC 1
+  #endif
+  #ifndef CYTHON_USE_FREELISTS
+    #define CYTHON_USE_FREELISTS 0
+  #endif
 #else
   #define CYTHON_COMPILING_IN_PYPY 0
   #define CYTHON_COMPILING_IN_CPYTHON 1
@@ -410,6 +437,9 @@ END: Cython Metadata */
   #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
     #define CYTHON_UPDATE_DESCRIPTOR_DOC 1
   #endif
+  #ifndef CYTHON_USE_FREELISTS
+    #define CYTHON_USE_FREELISTS 1
+  #endif
 #endif
 #if !defined(CYTHON_FAST_PYCCALL)
 #define CYTHON_FAST_PYCCALL  (CYTHON_FAST_PYCALL && PY_VERSION_HEX >= 0x030600B1)
@@ -602,18 +632,19 @@ END: Cython Metadata */
         PyObject *exception_table = NULL;
         PyObject *types_module=NULL, *code_type=NULL, *result=NULL;
         #if __PYX_LIMITED_VERSION_HEX < 0x030B0000
-        PyObject *version_info; // borrowed
-        #endif
+        PyObject *version_info;
         PyObject *py_minor_version = NULL;
+        #endif
         long minor_version = 0;
         PyObject *type, *value, *traceback;
         PyErr_Fetch(&type, &value, &traceback);
         #if __PYX_LIMITED_VERSION_HEX >= 0x030B0000
-        minor_version = 11; // we don't yet need to distinguish between versions > 11
+        minor_version = 11;
         #else
         if (!(version_info = PySys_GetObject("version_info"))) goto end;
         if (!(py_minor_version = PySequence_GetItem(version_info, 1))) goto end;
         minor_version = PyLong_AsLong(py_minor_version);
+        Py_DECREF(py_minor_version);
         if (minor_version == -1 && PyErr_Occurred()) goto end;
         #endif
         if (!(types_module = PyImport_ImportModule("types"))) goto end;
@@ -634,7 +665,6 @@ END: Cython Metadata */
         Py_XDECREF(code_type);
         Py_XDECREF(exception_table);
         Py_XDECREF(types_module);
-        Py_XDECREF(py_minor_version);
         if (type) {
             PyErr_Restore(type, value, traceback);
         }
@@ -667,7 +697,7 @@ END: Cython Metadata */
                                                     PyObject *fv, PyObject *cell, PyObject* fn,
                                                     PyObject *name, int fline, PyObject *lnos) {
     PyCodeObject *result;
-    PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0);  // we don't have access to __pyx_empty_bytes here
+    PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0);
     if (!empty_bytes) return NULL;
     result =
       #if PY_VERSION_HEX >= 0x030C0000
@@ -753,8 +783,13 @@ END: Cython Metadata */
   typedef PyObject *(*__Pyx_PyCFunctionFastWithKeywords) (PyObject *self, PyObject *const *args,
                                                           Py_ssize_t nargs, PyObject *kwnames);
 #else
-  #define __Pyx_PyCFunctionFast _PyCFunctionFast
-  #define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords
+  #if PY_VERSION_HEX >= 0x030d00A4
+  #  define __Pyx_PyCFunctionFast PyCFunctionFast
+  #  define __Pyx_PyCFunctionFastWithKeywords PyCFunctionFastWithKeywords
+  #else
+  #  define __Pyx_PyCFunctionFast _PyCFunctionFast
+  #  define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords
+  #endif
 #endif
 #if CYTHON_METH_FASTCALL
   #define __Pyx_METH_FASTCALL METH_FASTCALL
@@ -829,6 +864,8 @@ static CYTHON_INLINE int __Pyx__IsSameCFunction(PyObject *func, void *cfunc) {
   #define __Pyx_PyThreadState_Current PyThreadState_Get()
 #elif !CYTHON_FAST_THREAD_STATE
   #define __Pyx_PyThreadState_Current PyThreadState_GET()
+#elif PY_VERSION_HEX >= 0x030d00A1
+  #define __Pyx_PyThreadState_Current PyThreadState_GetUnchecked()
 #elif PY_VERSION_HEX >= 0x03060000
   #define __Pyx_PyThreadState_Current _PyThreadState_UncheckedGet()
 #elif PY_VERSION_HEX >= 0x03000000
@@ -904,7 +941,7 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) {
         }
     #endif
 #endif
-#if CYTHON_COMPILING_IN_CPYTHON || defined(_PyDict_NewPresized)
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030d0000 || defined(_PyDict_NewPresized)
 #define __Pyx_PyDict_NewPresized(n)  ((n <= 8) ? PyDict_New() : _PyDict_NewPresized(n))
 #else
 #define __Pyx_PyDict_NewPresized(n)  PyDict_New()
@@ -916,7 +953,7 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) {
   #define __Pyx_PyNumber_Divide(x,y)         PyNumber_Divide(x,y)
   #define __Pyx_PyNumber_InPlaceDivide(x,y)  PyNumber_InPlaceDivide(x,y)
 #endif
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX > 0x030600B4 && CYTHON_USE_UNICODE_INTERNALS
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX > 0x030600B4 && PY_VERSION_HEX < 0x030d0000 && CYTHON_USE_UNICODE_INTERNALS
 #define __Pyx_PyDict_GetItemStrWithError(dict, name)  _PyDict_GetItem_KnownHash(dict, name, ((PyASCIIObject *) name)->hash)
 static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStr(PyObject *dict, PyObject *name) {
     PyObject *res = __Pyx_PyDict_GetItemStrWithError(dict, name);
@@ -960,7 +997,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict,
 #endif
 #if CYTHON_USE_TYPE_SPECS && PY_VERSION_HEX >= 0x03080000
 #define __Pyx_PyHeapTypeObject_GC_Del(obj)  {\
-    PyTypeObject *type = Py_TYPE(obj);\
+    PyTypeObject *type = Py_TYPE((PyObject*)obj);\
     assert(__Pyx_PyType_HasFeature(type, Py_TPFLAGS_HEAPTYPE));\
     PyObject_GC_Del(obj);\
     Py_DECREF(type);\
@@ -1104,6 +1141,15 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict,
   #define __Pyx_PyBytes_GET_SIZE(o) PyBytes_Size(o)
   #define __Pyx_PyByteArray_GET_SIZE(o) PyByteArray_Size(o)
 #endif
+#if __PYX_LIMITED_VERSION_HEX >= 0x030d00A1
+  #define __Pyx_PyImport_AddModuleRef(name) PyImport_AddModuleRef(name)
+#else
+  static CYTHON_INLINE PyObject *__Pyx_PyImport_AddModuleRef(const char *name) {
+      PyObject *module = PyImport_AddModule(name);
+      Py_XINCREF(module);
+      return module;
+  }
+#endif
 #if PY_MAJOR_VERSION >= 3
   #define PyIntObject                  PyLongObject
   #define PyInt_Type                   PyLong_Type
@@ -1182,7 +1228,7 @@ static CYTHON_INLINE float __PYX_NAN() {
 #endif
 
 #define __PYX_MARK_ERR_POS(f_index, lineno) \
-    { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__; (void)__pyx_clineno; }
+    { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__;  (void)__pyx_clineno; }
 #define __PYX_ERR(f_index, lineno, Ln_error) \
     { __PYX_MARK_ERR_POS(f_index, lineno) goto Ln_error; }
 
@@ -1297,24 +1343,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char*);
 #define __Pyx_PyByteArray_FromCString(s)   __Pyx_PyByteArray_FromString((const char*)s)
 #define __Pyx_PyStr_FromCString(s)     __Pyx_PyStr_FromString((const char*)s)
 #define __Pyx_PyUnicode_FromCString(s) __Pyx_PyUnicode_FromString((const char*)s)
-#if CYTHON_COMPILING_IN_LIMITED_API
-static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const wchar_t *u)
-{
-    const wchar_t *u_end = u;
-    while (*u_end++) ;
-    return (size_t)(u_end - u - 1);
-}
-#else
-static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u)
-{
-    const Py_UNICODE *u_end = u;
-    while (*u_end++) ;
-    return (size_t)(u_end - u - 1);
-}
-#endif
 #define __Pyx_PyUnicode_FromOrdinal(o)       PyUnicode_FromOrdinal((int)o)
-#define __Pyx_PyUnicode_FromUnicode(u)       PyUnicode_FromUnicode(u, __Pyx_Py_UNICODE_strlen(u))
-#define __Pyx_PyUnicode_FromUnicodeAndLength PyUnicode_FromUnicode
 #define __Pyx_PyUnicode_AsUnicode            PyUnicode_AsUnicode
 #define __Pyx_NewRef(obj) (Py_INCREF(obj), obj)
 #define __Pyx_Owned_Py_None(b) __Pyx_NewRef(Py_None)
@@ -1364,7 +1393,7 @@ static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*);
   #endif
   typedef Py_ssize_t  __Pyx_compact_pylong;
   typedef size_t  __Pyx_compact_upylong;
-  #else  // Py < 3.12
+  #else
   #define __Pyx_PyLong_IsNeg(x)  (Py_SIZE(x) < 0)
   #define __Pyx_PyLong_IsNonNeg(x)  (Py_SIZE(x) >= 0)
   #define __Pyx_PyLong_IsZero(x)  (Py_SIZE(x) == 0)
@@ -1505,7 +1534,7 @@ static const char *__pyx_f[] = {
 /*--- Type declarations ---*/
 struct __pyx_opt_args_7pyogrio_4_ogr_get_string;
 
-/* "pyogrio/_ogr.pxd":388
+/* "pyogrio/_ogr.pxd":444
  * 
  * 
  * cdef get_string(const char *c_str, str encoding=*)             # <<<<<<<<<<<<<<
@@ -1687,8 +1716,8 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
     #define __Pyx_Arg_NewRef_VARARGS(arg) __Pyx_NewRef(arg)
     #define __Pyx_Arg_XDECREF_VARARGS(arg) Py_XDECREF(arg)
 #else
-    #define __Pyx_Arg_NewRef_VARARGS(arg) arg // no-op
-    #define __Pyx_Arg_XDECREF_VARARGS(arg) // no-op - arg is borrowed
+    #define __Pyx_Arg_NewRef_VARARGS(arg) arg
+    #define __Pyx_Arg_XDECREF_VARARGS(arg)
 #endif
 #define __Pyx_NumKwargs_VARARGS(kwds) PyDict_Size(kwds)
 #define __Pyx_KwValues_VARARGS(args, nargs) NULL
@@ -1699,9 +1728,14 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
     #define __Pyx_NumKwargs_FASTCALL(kwds) PyTuple_GET_SIZE(kwds)
     #define __Pyx_KwValues_FASTCALL(args, nargs) ((args) + (nargs))
     static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues, PyObject *s);
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
+    CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
+  #else
     #define __Pyx_KwargsAsDict_FASTCALL(kw, kwvalues) _PyStack_AsDict(kwvalues, kw)
-    #define __Pyx_Arg_NewRef_FASTCALL(arg) arg // no-op, __Pyx_Arg_FASTCALL is direct and this needs
-    #define __Pyx_Arg_XDECREF_FASTCALL(arg)  // no-op - arg was returned from array
+  #endif
+    #define __Pyx_Arg_NewRef_FASTCALL(arg) arg  /* no-op, __Pyx_Arg_FASTCALL is direct and this needs
+                                                   to have the same reference counting */
+    #define __Pyx_Arg_XDECREF_FASTCALL(arg)
 #else
     #define __Pyx_Arg_FASTCALL __Pyx_Arg_VARARGS
     #define __Pyx_NumKwargs_FASTCALL __Pyx_NumKwargs_VARARGS
@@ -1812,6 +1846,60 @@ static CYTHON_INLINE PyObject* __Pyx_decode_c_string(
          const char* encoding, const char* errors,
          PyObject* (*decode_func)(const char *s, Py_ssize_t size, const char *errors));
 
+/* GetTopmostException.proto */
+#if CYTHON_USE_EXC_INFO_STACK && CYTHON_FAST_THREAD_STATE
+static _PyErr_StackItem * __Pyx_PyErr_GetTopmostException(PyThreadState *tstate);
+#endif
+
+/* SaveResetException.proto */
+#if CYTHON_FAST_THREAD_STATE
+#define __Pyx_ExceptionSave(type, value, tb)  __Pyx__ExceptionSave(__pyx_tstate, type, value, tb)
+static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);
+#define __Pyx_ExceptionReset(type, value, tb)  __Pyx__ExceptionReset(__pyx_tstate, type, value, tb)
+static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb);
+#else
+#define __Pyx_ExceptionSave(type, value, tb)   PyErr_GetExcInfo(type, value, tb)
+#define __Pyx_ExceptionReset(type, value, tb)  PyErr_SetExcInfo(type, value, tb)
+#endif
+
+/* GetException.proto */
+#if CYTHON_FAST_THREAD_STATE
+#define __Pyx_GetException(type, value, tb)  __Pyx__GetException(__pyx_tstate, type, value, tb)
+static int __Pyx__GetException(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);
+#else
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb);
+#endif
+
+/* PyObjectFormatSimple.proto */
+#if CYTHON_COMPILING_IN_PYPY
+    #define __Pyx_PyObject_FormatSimple(s, f) (\
+        likely(PyUnicode_CheckExact(s)) ? (Py_INCREF(s), s) :\
+        PyObject_Format(s, f))
+#elif PY_MAJOR_VERSION < 3
+    #define __Pyx_PyObject_FormatSimple(s, f) (\
+        likely(PyUnicode_CheckExact(s)) ? (Py_INCREF(s), s) :\
+        likely(PyString_CheckExact(s)) ? PyUnicode_FromEncodedObject(s, NULL, "strict") :\
+        PyObject_Format(s, f))
+#elif CYTHON_USE_TYPE_SLOTS
+    #define __Pyx_PyObject_FormatSimple(s, f) (\
+        likely(PyUnicode_CheckExact(s)) ? (Py_INCREF(s), s) :\
+        likely(PyLong_CheckExact(s)) ? PyLong_Type.tp_repr(s) :\
+        likely(PyFloat_CheckExact(s)) ? PyFloat_Type.tp_repr(s) :\
+        PyObject_Format(s, f))
+#else
+    #define __Pyx_PyObject_FormatSimple(s, f) (\
+        likely(PyUnicode_CheckExact(s)) ? (Py_INCREF(s), s) :\
+        PyObject_Format(s, f))
+#endif
+
+/* SwapException.proto */
+#if CYTHON_FAST_THREAD_STATE
+#define __Pyx_ExceptionSwap(type, value, tb)  __Pyx__ExceptionSwap(__pyx_tstate, type, value, tb)
+static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);
+#else
+static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb);
+#endif
+
 /* PyDictVersioning.proto */
 #if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS
 #define __PYX_DICT_VERSION_INIT  ((PY_UINT64_T) -1)
@@ -1896,7 +1984,7 @@ static PyObject* __Pyx_PEP560_update_bases(PyObject *bases);
 static PyObject *__Pyx_CalculateMetaclass(PyTypeObject *metaclass, PyObject *bases);
 
 /* SetNameInClass.proto */
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1 && PY_VERSION_HEX < 0x030d0000
 #define __Pyx_SetNameInClass(ns, name, value)\
     (likely(PyDict_CheckExact(ns)) ? _PyDict_SetItem_KnownHash(ns, name, value, ((PyASCIIObject *) name)->hash) : PyObject_SetItem(ns, name, value))
 #elif CYTHON_COMPILING_IN_CPYTHON
@@ -2023,7 +2111,7 @@ typedef struct {
 #endif
     void *defaults;
     int defaults_pyobjects;
-    size_t defaults_size;  // used by FusedFunction for copying defaults
+    size_t defaults_size;
     int flags;
     PyObject *defaults_tuple;
     PyObject *defaults_kwdict;
@@ -2178,6 +2266,7 @@ int __pyx_module_is_main_pyogrio___err = 0;
 /* Implementation of "pyogrio._err" */
 /* #### Code section: global_var ### */
 static PyObject *__pyx_builtin_property;
+static PyObject *__pyx_builtin_UnicodeDecodeError;
 static PyObject *__pyx_builtin_SystemExit;
 static PyObject *__pyx_builtin_RuntimeWarning;
 /* #### Code section: string_decls ### */
@@ -2241,6 +2330,7 @@ static const char __pyx_k_No_error_message[] = "No error message.";
 static const char __pyx_k_NullPointerError[] = "NullPointerError";
 static const char __pyx_k_pyogrio__err_pyx[] = "pyogrio\\_err.pyx";
 static const char __pyx_k_NULL_pointer_error[] = "NULL pointer error";
+static const char __pyx_k_UnicodeDecodeError[] = "UnicodeDecodeError";
 static const char __pyx_k_asyncio_coroutines[] = "asyncio.coroutines";
 static const char __pyx_k_cline_in_traceback[] = "cline_in_traceback";
 static const char __pyx_k_CPLE_BaseError_args[] = "CPLE_BaseError.args";
@@ -2265,6 +2355,7 @@ static const char __pyx_k_Returned_from_exc_wrap_pointer[] = "\n    Returned fro
 static const char __pyx_k_CPLE_AWSInvalidCredentialsError[] = "CPLE_AWSInvalidCredentialsError";
 static const char __pyx_k_Base_CPL_error_class_For_interna[] = "Base CPL error class.\n    For internal use within Cython only.\n    ";
 static const char __pyx_k_CPLE_AWSSignatureDoesNotMatchErr[] = "CPLE_AWSSignatureDoesNotMatchError";
+static const char __pyx_k_Could_not_decode_error_message_t[] = "Could not decode error message to UTF-8.  Raw error: ";
 /* #### Code section: decls ### */
 static PyObject *__pyx_pf_7pyogrio_4_err_14CPLE_BaseError___init__(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_self, PyObject *__pyx_v_error, PyObject *__pyx_v_errno, PyObject *__pyx_v_errmsg); /* proto */
 static PyObject *__pyx_pf_7pyogrio_4_err_14CPLE_BaseError_2__str__(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_self); /* proto */
@@ -2330,6 +2421,7 @@ typedef struct {
   PyObject *__pyx_n_s_CPLE_OpenFailedError;
   PyObject *__pyx_n_s_CPLE_OutOfMemoryError;
   PyObject *__pyx_n_s_CPLE_UserInterruptError;
+  PyObject *__pyx_kp_u_Could_not_decode_error_message_t;
   PyObject *__pyx_kp_u_Fatal_error_0;
   PyObject *__pyx_n_s_GDALError;
   PyObject *__pyx_n_s_IntEnum;
@@ -2341,6 +2433,7 @@ typedef struct {
   PyObject *__pyx_kp_s_Returned_from_exc_wrap_pointer;
   PyObject *__pyx_n_s_RuntimeWarning;
   PyObject *__pyx_n_s_SystemExit;
+  PyObject *__pyx_n_s_UnicodeDecodeError;
   PyObject *__pyx_kp_u_Unspecified_OGR_GDAL_error;
   PyObject *__pyx_kp_u__10;
   PyObject *__pyx_n_s__11;
@@ -2484,6 +2577,7 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_CPLE_OpenFailedError);
   Py_CLEAR(clear_module_state->__pyx_n_s_CPLE_OutOfMemoryError);
   Py_CLEAR(clear_module_state->__pyx_n_s_CPLE_UserInterruptError);
+  Py_CLEAR(clear_module_state->__pyx_kp_u_Could_not_decode_error_message_t);
   Py_CLEAR(clear_module_state->__pyx_kp_u_Fatal_error_0);
   Py_CLEAR(clear_module_state->__pyx_n_s_GDALError);
   Py_CLEAR(clear_module_state->__pyx_n_s_IntEnum);
@@ -2495,6 +2589,7 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_kp_s_Returned_from_exc_wrap_pointer);
   Py_CLEAR(clear_module_state->__pyx_n_s_RuntimeWarning);
   Py_CLEAR(clear_module_state->__pyx_n_s_SystemExit);
+  Py_CLEAR(clear_module_state->__pyx_n_s_UnicodeDecodeError);
   Py_CLEAR(clear_module_state->__pyx_kp_u_Unspecified_OGR_GDAL_error);
   Py_CLEAR(clear_module_state->__pyx_kp_u__10);
   Py_CLEAR(clear_module_state->__pyx_n_s__11);
@@ -2616,6 +2711,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_CPLE_OpenFailedError);
   Py_VISIT(traverse_module_state->__pyx_n_s_CPLE_OutOfMemoryError);
   Py_VISIT(traverse_module_state->__pyx_n_s_CPLE_UserInterruptError);
+  Py_VISIT(traverse_module_state->__pyx_kp_u_Could_not_decode_error_message_t);
   Py_VISIT(traverse_module_state->__pyx_kp_u_Fatal_error_0);
   Py_VISIT(traverse_module_state->__pyx_n_s_GDALError);
   Py_VISIT(traverse_module_state->__pyx_n_s_IntEnum);
@@ -2627,6 +2723,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_kp_s_Returned_from_exc_wrap_pointer);
   Py_VISIT(traverse_module_state->__pyx_n_s_RuntimeWarning);
   Py_VISIT(traverse_module_state->__pyx_n_s_SystemExit);
+  Py_VISIT(traverse_module_state->__pyx_n_s_UnicodeDecodeError);
   Py_VISIT(traverse_module_state->__pyx_kp_u_Unspecified_OGR_GDAL_error);
   Py_VISIT(traverse_module_state->__pyx_kp_u__10);
   Py_VISIT(traverse_module_state->__pyx_n_s__11);
@@ -2766,6 +2863,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_CPLE_OpenFailedError __pyx_mstate_global->__pyx_n_s_CPLE_OpenFailedError
 #define __pyx_n_s_CPLE_OutOfMemoryError __pyx_mstate_global->__pyx_n_s_CPLE_OutOfMemoryError
 #define __pyx_n_s_CPLE_UserInterruptError __pyx_mstate_global->__pyx_n_s_CPLE_UserInterruptError
+#define __pyx_kp_u_Could_not_decode_error_message_t __pyx_mstate_global->__pyx_kp_u_Could_not_decode_error_message_t
 #define __pyx_kp_u_Fatal_error_0 __pyx_mstate_global->__pyx_kp_u_Fatal_error_0
 #define __pyx_n_s_GDALError __pyx_mstate_global->__pyx_n_s_GDALError
 #define __pyx_n_s_IntEnum __pyx_mstate_global->__pyx_n_s_IntEnum
@@ -2777,6 +2875,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_kp_s_Returned_from_exc_wrap_pointer __pyx_mstate_global->__pyx_kp_s_Returned_from_exc_wrap_pointer
 #define __pyx_n_s_RuntimeWarning __pyx_mstate_global->__pyx_n_s_RuntimeWarning
 #define __pyx_n_s_SystemExit __pyx_mstate_global->__pyx_n_s_SystemExit
+#define __pyx_n_s_UnicodeDecodeError __pyx_mstate_global->__pyx_n_s_UnicodeDecodeError
 #define __pyx_kp_u_Unspecified_OGR_GDAL_error __pyx_mstate_global->__pyx_kp_u_Unspecified_OGR_GDAL_error
 #define __pyx_kp_u__10 __pyx_mstate_global->__pyx_kp_u__10
 #define __pyx_n_s__11 __pyx_mstate_global->__pyx_n_s__11
@@ -3595,17 +3694,29 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
   char const *__pyx_v_err_msg;
   PyObject *__pyx_v_msg = NULL;
   char const *__pyx_v_msg_b;
+  CYTHON_UNUSED PyObject *__pyx_v_exc = NULL;
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   int __pyx_t_1;
-  Py_ssize_t __pyx_t_2;
+  PyObject *__pyx_t_2 = NULL;
   PyObject *__pyx_t_3 = NULL;
   PyObject *__pyx_t_4 = NULL;
-  PyObject *__pyx_t_5 = NULL;
+  Py_ssize_t __pyx_t_5;
   PyObject *__pyx_t_6 = NULL;
   PyObject *__pyx_t_7 = NULL;
-  PyObject *__pyx_t_8 = NULL;
-  int __pyx_t_9;
+  int __pyx_t_8;
+  PyObject *__pyx_t_9 = NULL;
+  PyObject *__pyx_t_10 = NULL;
+  PyObject *__pyx_t_11 = NULL;
+  int __pyx_t_12;
+  char const *__pyx_t_13;
+  PyObject *__pyx_t_14 = NULL;
+  PyObject *__pyx_t_15 = NULL;
+  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_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -3681,59 +3792,203 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
  *     else:
  *         # Reformat messages.
  *         msg_b = err_msg             # <<<<<<<<<<<<<<
- *         msg = msg_b.decode('utf-8')
- *         msg = msg.replace("`", "'")
+ * 
+ *         try:
  */
   /*else*/ {
     __pyx_v_msg_b = __pyx_v_err_msg;
 
-    /* "pyogrio/_err.pyx":156
- *         # Reformat messages.
+    /* "pyogrio/_err.pyx":157
  *         msg_b = err_msg
- *         msg = msg_b.decode('utf-8')             # <<<<<<<<<<<<<<
- *         msg = msg.replace("`", "'")
- *         msg = msg.replace("\n", " ")
+ * 
+ *         try:             # <<<<<<<<<<<<<<
+ *             msg = msg_b.decode('utf-8')
+ *             msg = msg.replace("`", "'")
  */
-    __pyx_t_2 = __Pyx_ssize_strlen(__pyx_v_msg_b); if (unlikely(__pyx_t_2 == ((Py_ssize_t)-1))) __PYX_ERR(0, 156, __pyx_L1_error)
-    __pyx_t_3 = __Pyx_decode_c_string(__pyx_v_msg_b, 0, __pyx_t_2, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 156, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __pyx_v_msg = __pyx_t_3;
-    __pyx_t_3 = 0;
+    {
+      __Pyx_PyThreadState_declare
+      __Pyx_PyThreadState_assign
+      __Pyx_ExceptionSave(&__pyx_t_2, &__pyx_t_3, &__pyx_t_4);
+      __Pyx_XGOTREF(__pyx_t_2);
+      __Pyx_XGOTREF(__pyx_t_3);
+      __Pyx_XGOTREF(__pyx_t_4);
+      /*try:*/ {
 
-    /* "pyogrio/_err.pyx":157
+        /* "pyogrio/_err.pyx":158
+ * 
+ *         try:
+ *             msg = msg_b.decode('utf-8')             # <<<<<<<<<<<<<<
+ *             msg = msg.replace("`", "'")
+ *             msg = msg.replace("\n", " ")
+ */
+        __pyx_t_5 = __Pyx_ssize_strlen(__pyx_v_msg_b); if (unlikely(__pyx_t_5 == ((Py_ssize_t)-1))) __PYX_ERR(0, 158, __pyx_L4_error)
+        __pyx_t_6 = __Pyx_decode_c_string(__pyx_v_msg_b, 0, __pyx_t_5, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 158, __pyx_L4_error)
+        __Pyx_GOTREF(__pyx_t_6);
+        __pyx_v_msg = __pyx_t_6;
+        __pyx_t_6 = 0;
+
+        /* "pyogrio/_err.pyx":159
+ *         try:
+ *             msg = msg_b.decode('utf-8')
+ *             msg = msg.replace("`", "'")             # <<<<<<<<<<<<<<
+ *             msg = msg.replace("\n", " ")
+ *         except UnicodeDecodeError as exc:
+ */
+        __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_msg, __pyx_n_s_replace); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 159, __pyx_L4_error)
+        __Pyx_GOTREF(__pyx_t_6);
+        __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 159, __pyx_L4_error)
+        __Pyx_GOTREF(__pyx_t_7);
+        __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+        __Pyx_DECREF_SET(__pyx_v_msg, __pyx_t_7);
+        __pyx_t_7 = 0;
+
+        /* "pyogrio/_err.pyx":160
+ *             msg = msg_b.decode('utf-8')
+ *             msg = msg.replace("`", "'")
+ *             msg = msg.replace("\n", " ")             # <<<<<<<<<<<<<<
+ *         except UnicodeDecodeError as exc:
+ *             msg = f"Could not decode error message to UTF-8.  Raw error: {msg_b}"
+ */
+        __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_msg, __pyx_n_s_replace); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 160, __pyx_L4_error)
+        __Pyx_GOTREF(__pyx_t_7);
+        __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 160, __pyx_L4_error)
+        __Pyx_GOTREF(__pyx_t_6);
+        __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
+        __Pyx_DECREF_SET(__pyx_v_msg, __pyx_t_6);
+        __pyx_t_6 = 0;
+
+        /* "pyogrio/_err.pyx":157
  *         msg_b = err_msg
- *         msg = msg_b.decode('utf-8')
- *         msg = msg.replace("`", "'")             # <<<<<<<<<<<<<<
- *         msg = msg.replace("\n", " ")
  * 
+ *         try:             # <<<<<<<<<<<<<<
+ *             msg = msg_b.decode('utf-8')
+ *             msg = msg.replace("`", "'")
  */
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_msg, __pyx_n_s_replace); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 157, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 157, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __Pyx_DECREF_SET(__pyx_v_msg, __pyx_t_4);
-    __pyx_t_4 = 0;
+      }
+      __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
+      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
+      goto __pyx_L9_try_end;
+      __pyx_L4_error:;
+      __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
+      __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;
+
+      /* "pyogrio/_err.pyx":161
+ *             msg = msg.replace("`", "'")
+ *             msg = msg.replace("\n", " ")
+ *         except UnicodeDecodeError as exc:             # <<<<<<<<<<<<<<
+ *             msg = f"Could not decode error message to UTF-8.  Raw error: {msg_b}"
+ * 
+ */
+      __pyx_t_8 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_UnicodeDecodeError);
+      if (__pyx_t_8) {
+        __Pyx_AddTraceback("pyogrio._err.exc_check", __pyx_clineno, __pyx_lineno, __pyx_filename);
+        if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_7, &__pyx_t_9) < 0) __PYX_ERR(0, 161, __pyx_L6_except_error)
+        __Pyx_XGOTREF(__pyx_t_6);
+        __Pyx_XGOTREF(__pyx_t_7);
+        __Pyx_XGOTREF(__pyx_t_9);
+        __Pyx_INCREF(__pyx_t_7);
+        __pyx_v_exc = __pyx_t_7;
+        /*try:*/ {
 
-    /* "pyogrio/_err.pyx":158
- *         msg = msg_b.decode('utf-8')
- *         msg = msg.replace("`", "'")
- *         msg = msg.replace("\n", " ")             # <<<<<<<<<<<<<<
+          /* "pyogrio/_err.pyx":162
+ *             msg = msg.replace("\n", " ")
+ *         except UnicodeDecodeError as exc:
+ *             msg = f"Could not decode error message to UTF-8.  Raw error: {msg_b}"             # <<<<<<<<<<<<<<
  * 
  *     if err_type == 3:
  */
-    __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_msg, __pyx_n_s_replace); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 158, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 158, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __Pyx_DECREF_SET(__pyx_v_msg, __pyx_t_3);
-    __pyx_t_3 = 0;
+          __pyx_t_10 = __Pyx_PyBytes_FromString(__pyx_v_msg_b); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 162, __pyx_L15_error)
+          __Pyx_GOTREF(__pyx_t_10);
+          __pyx_t_11 = __Pyx_PyObject_FormatSimple(__pyx_t_10, __pyx_empty_unicode); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 162, __pyx_L15_error)
+          __Pyx_GOTREF(__pyx_t_11);
+          __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
+          __pyx_t_10 = __Pyx_PyUnicode_Concat(__pyx_kp_u_Could_not_decode_error_message_t, __pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 162, __pyx_L15_error)
+          __Pyx_GOTREF(__pyx_t_10);
+          __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
+          __Pyx_XDECREF_SET(__pyx_v_msg, __pyx_t_10);
+          __pyx_t_10 = 0;
+        }
+
+        /* "pyogrio/_err.pyx":161
+ *             msg = msg.replace("`", "'")
+ *             msg = msg.replace("\n", " ")
+ *         except UnicodeDecodeError as exc:             # <<<<<<<<<<<<<<
+ *             msg = f"Could not decode error message to UTF-8.  Raw error: {msg_b}"
+ * 
+ */
+        /*finally:*/ {
+          /*normal exit:*/{
+            __Pyx_DECREF(__pyx_v_exc); __pyx_v_exc = 0;
+            goto __pyx_L16;
+          }
+          __pyx_L15_error:;
+          /*exception exit:*/{
+            __Pyx_PyThreadState_declare
+            __Pyx_PyThreadState_assign
+            __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0;
+            __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
+            __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
+            if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19);
+            if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16) < 0)) __Pyx_ErrFetch(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16);
+            __Pyx_XGOTREF(__pyx_t_14);
+            __Pyx_XGOTREF(__pyx_t_15);
+            __Pyx_XGOTREF(__pyx_t_16);
+            __Pyx_XGOTREF(__pyx_t_17);
+            __Pyx_XGOTREF(__pyx_t_18);
+            __Pyx_XGOTREF(__pyx_t_19);
+            __pyx_t_8 = __pyx_lineno; __pyx_t_12 = __pyx_clineno; __pyx_t_13 = __pyx_filename;
+            {
+              __Pyx_DECREF(__pyx_v_exc); __pyx_v_exc = 0;
+            }
+            if (PY_MAJOR_VERSION >= 3) {
+              __Pyx_XGIVEREF(__pyx_t_17);
+              __Pyx_XGIVEREF(__pyx_t_18);
+              __Pyx_XGIVEREF(__pyx_t_19);
+              __Pyx_ExceptionReset(__pyx_t_17, __pyx_t_18, __pyx_t_19);
+            }
+            __Pyx_XGIVEREF(__pyx_t_14);
+            __Pyx_XGIVEREF(__pyx_t_15);
+            __Pyx_XGIVEREF(__pyx_t_16);
+            __Pyx_ErrRestore(__pyx_t_14, __pyx_t_15, __pyx_t_16);
+            __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0;
+            __pyx_lineno = __pyx_t_8; __pyx_clineno = __pyx_t_12; __pyx_filename = __pyx_t_13;
+            goto __pyx_L6_except_error;
+          }
+          __pyx_L16:;
+        }
+        __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
+        __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;
+        __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;
+        goto __pyx_L5_exception_handled;
+      }
+      goto __pyx_L6_except_error;
+
+      /* "pyogrio/_err.pyx":157
+ *         msg_b = err_msg
+ * 
+ *         try:             # <<<<<<<<<<<<<<
+ *             msg = msg_b.decode('utf-8')
+ *             msg = msg.replace("`", "'")
+ */
+      __pyx_L6_except_error:;
+      __Pyx_XGIVEREF(__pyx_t_2);
+      __Pyx_XGIVEREF(__pyx_t_3);
+      __Pyx_XGIVEREF(__pyx_t_4);
+      __Pyx_ExceptionReset(__pyx_t_2, __pyx_t_3, __pyx_t_4);
+      goto __pyx_L1_error;
+      __pyx_L5_exception_handled:;
+      __Pyx_XGIVEREF(__pyx_t_2);
+      __Pyx_XGIVEREF(__pyx_t_3);
+      __Pyx_XGIVEREF(__pyx_t_4);
+      __Pyx_ExceptionReset(__pyx_t_2, __pyx_t_3, __pyx_t_4);
+      __pyx_L9_try_end:;
+    }
   }
   __pyx_L3:;
 
-  /* "pyogrio/_err.pyx":160
- *         msg = msg.replace("\n", " ")
+  /* "pyogrio/_err.pyx":164
+ *             msg = f"Could not decode error message to UTF-8.  Raw error: {msg_b}"
  * 
  *     if err_type == 3:             # <<<<<<<<<<<<<<
  *         CPLErrorReset()
@@ -3742,7 +3997,7 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
   __pyx_t_1 = (__pyx_v_err_type == 3);
   if (__pyx_t_1) {
 
-    /* "pyogrio/_err.pyx":161
+    /* "pyogrio/_err.pyx":165
  * 
  *     if err_type == 3:
  *         CPLErrorReset()             # <<<<<<<<<<<<<<
@@ -3751,7 +4006,7 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
  */
     CPLErrorReset();
 
-    /* "pyogrio/_err.pyx":162
+    /* "pyogrio/_err.pyx":166
  *     if err_type == 3:
  *         CPLErrorReset()
  *         return exception_map.get(             # <<<<<<<<<<<<<<
@@ -3760,96 +4015,96 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "pyogrio/_err.pyx":163
+    /* "pyogrio/_err.pyx":167
  *         CPLErrorReset()
  *         return exception_map.get(
  *             err_no, CPLE_BaseError)(err_type, err_no, msg)             # <<<<<<<<<<<<<<
  * 
  *     if err_type == 4:
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_exception_map); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 162, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_5);
+    __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_exception_map); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 166, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_6);
 
-    /* "pyogrio/_err.pyx":162
+    /* "pyogrio/_err.pyx":166
  *     if err_type == 3:
  *         CPLErrorReset()
  *         return exception_map.get(             # <<<<<<<<<<<<<<
  *             err_no, CPLE_BaseError)(err_type, err_no, msg)
  * 
  */
-    __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 162, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_6);
-    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_get); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 166, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_10);
+    __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-    /* "pyogrio/_err.pyx":163
+    /* "pyogrio/_err.pyx":167
  *         CPLErrorReset()
  *         return exception_map.get(
  *             err_no, CPLE_BaseError)(err_type, err_no, msg)             # <<<<<<<<<<<<<<
  * 
  *     if err_type == 4:
  */
-    __pyx_t_5 = __Pyx_PyInt_From_int(__pyx_v_err_no); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 163, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_5);
-    __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 163, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_7);
-    __pyx_t_8 = NULL;
-    __pyx_t_9 = 0;
+    __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_err_no); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 167, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_6);
+    __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 167, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_11);
+    __pyx_t_20 = NULL;
+    __pyx_t_12 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (unlikely(PyMethod_Check(__pyx_t_6))) {
-      __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_6);
-      if (likely(__pyx_t_8)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6);
-        __Pyx_INCREF(__pyx_t_8);
+    if (unlikely(PyMethod_Check(__pyx_t_10))) {
+      __pyx_t_20 = PyMethod_GET_SELF(__pyx_t_10);
+      if (likely(__pyx_t_20)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_10);
+        __Pyx_INCREF(__pyx_t_20);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_6, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_10, function);
+        __pyx_t_12 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[3] = {__pyx_t_8, __pyx_t_5, __pyx_t_7};
-      __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_9, 2+__pyx_t_9);
-      __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-      if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 162, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_4);
+      PyObject *__pyx_callargs[3] = {__pyx_t_20, __pyx_t_6, __pyx_t_11};
+      __pyx_t_7 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_12, 2+__pyx_t_12);
+      __Pyx_XDECREF(__pyx_t_20); __pyx_t_20 = 0;
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    }
-    __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_err_type); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 163, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_6);
-    __pyx_t_7 = __Pyx_PyInt_From_int(__pyx_v_err_no); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 163, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_7);
-    __pyx_t_5 = NULL;
-    __pyx_t_9 = 0;
+      __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
+      if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 166, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_7);
+      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
+    }
+    __pyx_t_10 = __Pyx_PyInt_From_int(__pyx_v_err_type); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 167, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_10);
+    __pyx_t_11 = __Pyx_PyInt_From_int(__pyx_v_err_no); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 167, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_11);
+    __pyx_t_6 = NULL;
+    __pyx_t_12 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (unlikely(PyMethod_Check(__pyx_t_4))) {
-      __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4);
-      if (likely(__pyx_t_5)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4);
-        __Pyx_INCREF(__pyx_t_5);
+    if (unlikely(PyMethod_Check(__pyx_t_7))) {
+      __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_7);
+      if (likely(__pyx_t_6)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7);
+        __Pyx_INCREF(__pyx_t_6);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_4, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_7, function);
+        __pyx_t_12 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[4] = {__pyx_t_5, __pyx_t_6, __pyx_t_7, __pyx_v_msg};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
-      __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
-      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+      PyObject *__pyx_callargs[4] = {__pyx_t_6, __pyx_t_10, __pyx_t_11, __pyx_v_msg};
+      __pyx_t_9 = __Pyx_PyObject_FastCall(__pyx_t_7, __pyx_callargs+1-__pyx_t_12, 3+__pyx_t_12);
+      __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
+      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
+      __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
+      if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 167, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_9);
       __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 163, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     }
-    __pyx_r = __pyx_t_3;
-    __pyx_t_3 = 0;
+    __pyx_r = __pyx_t_9;
+    __pyx_t_9 = 0;
     goto __pyx_L0;
 
-    /* "pyogrio/_err.pyx":160
- *         msg = msg.replace("\n", " ")
+    /* "pyogrio/_err.pyx":164
+ *             msg = f"Could not decode error message to UTF-8.  Raw error: {msg_b}"
  * 
  *     if err_type == 3:             # <<<<<<<<<<<<<<
  *         CPLErrorReset()
@@ -3857,7 +4112,7 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
  */
   }
 
-  /* "pyogrio/_err.pyx":165
+  /* "pyogrio/_err.pyx":169
  *             err_no, CPLE_BaseError)(err_type, err_no, msg)
  * 
  *     if err_type == 4:             # <<<<<<<<<<<<<<
@@ -3867,7 +4122,7 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
   __pyx_t_1 = (__pyx_v_err_type == 4);
   if (__pyx_t_1) {
 
-    /* "pyogrio/_err.pyx":166
+    /* "pyogrio/_err.pyx":170
  * 
  *     if err_type == 4:
  *         return SystemExit("Fatal error: {0}".format((err_type, err_no, msg)))             # <<<<<<<<<<<<<<
@@ -3875,54 +4130,54 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
  *     else:
  */
     __Pyx_XDECREF(__pyx_r);
-    __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_Fatal_error_0, __pyx_n_s_format); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 166, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_7 = __Pyx_PyInt_From_int(__pyx_v_err_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 166, __pyx_L1_error)
+    __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_Fatal_error_0, __pyx_n_s_format); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 170, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
-    __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_err_no); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 166, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_PyInt_From_int(__pyx_v_err_type); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 170, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_11);
+    __pyx_t_10 = __Pyx_PyInt_From_int(__pyx_v_err_no); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 170, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_10);
+    __pyx_t_6 = PyTuple_New(3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 170, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
-    __pyx_t_5 = PyTuple_New(3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 166, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_5);
-    __Pyx_GIVEREF(__pyx_t_7);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_7)) __PYX_ERR(0, 166, __pyx_L1_error);
-    __Pyx_GIVEREF(__pyx_t_6);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_6)) __PYX_ERR(0, 166, __pyx_L1_error);
+    __Pyx_GIVEREF(__pyx_t_11);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_11)) __PYX_ERR(0, 170, __pyx_L1_error);
+    __Pyx_GIVEREF(__pyx_t_10);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_10)) __PYX_ERR(0, 170, __pyx_L1_error);
     __Pyx_INCREF(__pyx_v_msg);
     __Pyx_GIVEREF(__pyx_v_msg);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_v_msg)) __PYX_ERR(0, 166, __pyx_L1_error);
-    __pyx_t_7 = 0;
-    __pyx_t_6 = 0;
-    __pyx_t_6 = NULL;
-    __pyx_t_9 = 0;
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 2, __pyx_v_msg)) __PYX_ERR(0, 170, __pyx_L1_error);
+    __pyx_t_11 = 0;
+    __pyx_t_10 = 0;
+    __pyx_t_10 = NULL;
+    __pyx_t_12 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_4))) {
-      __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4);
-      if (likely(__pyx_t_6)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4);
-        __Pyx_INCREF(__pyx_t_6);
+    if (likely(PyMethod_Check(__pyx_t_7))) {
+      __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_7);
+      if (likely(__pyx_t_10)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7);
+        __Pyx_INCREF(__pyx_t_10);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_4, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_7, function);
+        __pyx_t_12 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[2] = {__pyx_t_6, __pyx_t_5};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
-      __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
-      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 166, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+      PyObject *__pyx_callargs[2] = {__pyx_t_10, __pyx_t_6};
+      __pyx_t_9 = __Pyx_PyObject_FastCall(__pyx_t_7, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12);
+      __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
+      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+      if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 170, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_9);
+      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
     }
-    __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_SystemExit, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 166, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_r = __pyx_t_4;
-    __pyx_t_4 = 0;
+    __pyx_t_7 = __Pyx_PyObject_CallOneArg(__pyx_builtin_SystemExit, __pyx_t_9); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 170, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_7);
+    __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
+    __pyx_r = __pyx_t_7;
+    __pyx_t_7 = 0;
     goto __pyx_L0;
 
-    /* "pyogrio/_err.pyx":165
+    /* "pyogrio/_err.pyx":169
  *             err_no, CPLE_BaseError)(err_type, err_no, msg)
  * 
  *     if err_type == 4:             # <<<<<<<<<<<<<<
@@ -3931,7 +4186,7 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
  */
   }
 
-  /* "pyogrio/_err.pyx":169
+  /* "pyogrio/_err.pyx":173
  * 
  *     else:
  *         return             # <<<<<<<<<<<<<<
@@ -3954,22 +4209,23 @@ static CYTHON_INLINE PyObject *__pyx_f_7pyogrio_4_err_exc_check(void) {
 
   /* function exit code */
   __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_XDECREF(__pyx_t_4);
-  __Pyx_XDECREF(__pyx_t_5);
   __Pyx_XDECREF(__pyx_t_6);
   __Pyx_XDECREF(__pyx_t_7);
-  __Pyx_XDECREF(__pyx_t_8);
+  __Pyx_XDECREF(__pyx_t_9);
+  __Pyx_XDECREF(__pyx_t_10);
+  __Pyx_XDECREF(__pyx_t_11);
+  __Pyx_XDECREF(__pyx_t_20);
   __Pyx_AddTraceback("pyogrio._err.exc_check", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = 0;
   __pyx_L0:;
   __Pyx_XDECREF(__pyx_v_msg);
+  __Pyx_XDECREF(__pyx_v_exc);
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "pyogrio/_err.pyx":172
+/* "pyogrio/_err.pyx":176
  * 
  * 
  * cdef void *exc_wrap_pointer(void *ptr) except NULL:             # <<<<<<<<<<<<<<
@@ -3989,7 +4245,7 @@ static void *__pyx_f_7pyogrio_4_err_exc_wrap_pointer(void *__pyx_v_ptr) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("exc_wrap_pointer", 1);
 
-  /* "pyogrio/_err.pyx":176
+  /* "pyogrio/_err.pyx":180
  *     Raises an exception if a non-fatal error has be set or if pointer is NULL.
  *     """
  *     if ptr == NULL:             # <<<<<<<<<<<<<<
@@ -3999,29 +4255,29 @@ static void *__pyx_f_7pyogrio_4_err_exc_wrap_pointer(void *__pyx_v_ptr) {
   __pyx_t_1 = (__pyx_v_ptr == NULL);
   if (__pyx_t_1) {
 
-    /* "pyogrio/_err.pyx":177
+    /* "pyogrio/_err.pyx":181
  *     """
  *     if ptr == NULL:
  *         exc = exc_check()             # <<<<<<<<<<<<<<
  *         if exc:
  *             raise exc
  */
-    __pyx_t_2 = __pyx_f_7pyogrio_4_err_exc_check(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 177, __pyx_L1_error)
+    __pyx_t_2 = __pyx_f_7pyogrio_4_err_exc_check(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_v_exc = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "pyogrio/_err.pyx":178
+    /* "pyogrio/_err.pyx":182
  *     if ptr == NULL:
  *         exc = exc_check()
  *         if exc:             # <<<<<<<<<<<<<<
  *             raise exc
  *         else:
  */
-    __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_exc); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 178, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_exc); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 182, __pyx_L1_error)
     if (unlikely(__pyx_t_1)) {
 
-      /* "pyogrio/_err.pyx":179
+      /* "pyogrio/_err.pyx":183
  *         exc = exc_check()
  *         if exc:
  *             raise exc             # <<<<<<<<<<<<<<
@@ -4029,9 +4285,9 @@ static void *__pyx_f_7pyogrio_4_err_exc_wrap_pointer(void *__pyx_v_ptr) {
  *             # null pointer was passed, but no error message from GDAL
  */
       __Pyx_Raise(__pyx_v_exc, 0, 0, 0);
-      __PYX_ERR(0, 179, __pyx_L1_error)
+      __PYX_ERR(0, 183, __pyx_L1_error)
 
-      /* "pyogrio/_err.pyx":178
+      /* "pyogrio/_err.pyx":182
  *     if ptr == NULL:
  *         exc = exc_check()
  *         if exc:             # <<<<<<<<<<<<<<
@@ -4040,7 +4296,7 @@ static void *__pyx_f_7pyogrio_4_err_exc_wrap_pointer(void *__pyx_v_ptr) {
  */
     }
 
-    /* "pyogrio/_err.pyx":182
+    /* "pyogrio/_err.pyx":186
  *         else:
  *             # null pointer was passed, but no error message from GDAL
  *             raise NullPointerError(-1, -1, "NULL pointer error")             # <<<<<<<<<<<<<<
@@ -4048,17 +4304,17 @@ static void *__pyx_f_7pyogrio_4_err_exc_wrap_pointer(void *__pyx_v_ptr) {
  * 
  */
     /*else*/ {
-      __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_NullPointerError); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 182, __pyx_L1_error)
+      __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_NullPointerError); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 186, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 182, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 186, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_Raise(__pyx_t_3, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __PYX_ERR(0, 182, __pyx_L1_error)
+      __PYX_ERR(0, 186, __pyx_L1_error)
     }
 
-    /* "pyogrio/_err.pyx":176
+    /* "pyogrio/_err.pyx":180
  *     Raises an exception if a non-fatal error has be set or if pointer is NULL.
  *     """
  *     if ptr == NULL:             # <<<<<<<<<<<<<<
@@ -4067,7 +4323,7 @@ static void *__pyx_f_7pyogrio_4_err_exc_wrap_pointer(void *__pyx_v_ptr) {
  */
   }
 
-  /* "pyogrio/_err.pyx":183
+  /* "pyogrio/_err.pyx":187
  *             # null pointer was passed, but no error message from GDAL
  *             raise NullPointerError(-1, -1, "NULL pointer error")
  *     return ptr             # <<<<<<<<<<<<<<
@@ -4077,7 +4333,7 @@ static void *__pyx_f_7pyogrio_4_err_exc_wrap_pointer(void *__pyx_v_ptr) {
   __pyx_r = __pyx_v_ptr;
   goto __pyx_L0;
 
-  /* "pyogrio/_err.pyx":172
+  /* "pyogrio/_err.pyx":176
  * 
  * 
  * cdef void *exc_wrap_pointer(void *ptr) except NULL:             # <<<<<<<<<<<<<<
@@ -4097,7 +4353,7 @@ static void *__pyx_f_7pyogrio_4_err_exc_wrap_pointer(void *__pyx_v_ptr) {
   return __pyx_r;
 }
 
-/* "pyogrio/_err.pyx":186
+/* "pyogrio/_err.pyx":190
  * 
  * 
  * cdef int exc_wrap_int(int err) except -1:             # <<<<<<<<<<<<<<
@@ -4117,7 +4373,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_int(int __pyx_v_err) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("exc_wrap_int", 1);
 
-  /* "pyogrio/_err.pyx":192
+  /* "pyogrio/_err.pyx":196
  *     Copied from Fiona (_err.pyx).
  *     """
  *     if err:             # <<<<<<<<<<<<<<
@@ -4127,29 +4383,29 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_int(int __pyx_v_err) {
   __pyx_t_1 = (__pyx_v_err != 0);
   if (__pyx_t_1) {
 
-    /* "pyogrio/_err.pyx":193
+    /* "pyogrio/_err.pyx":197
  *     """
  *     if err:
  *         exc = exc_check()             # <<<<<<<<<<<<<<
  *         if exc:
  *             raise exc
  */
-    __pyx_t_2 = __pyx_f_7pyogrio_4_err_exc_check(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 193, __pyx_L1_error)
+    __pyx_t_2 = __pyx_f_7pyogrio_4_err_exc_check(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 197, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_v_exc = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "pyogrio/_err.pyx":194
+    /* "pyogrio/_err.pyx":198
  *     if err:
  *         exc = exc_check()
  *         if exc:             # <<<<<<<<<<<<<<
  *             raise exc
  *         else:
  */
-    __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_exc); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 194, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_exc); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 198, __pyx_L1_error)
     if (unlikely(__pyx_t_1)) {
 
-      /* "pyogrio/_err.pyx":195
+      /* "pyogrio/_err.pyx":199
  *         exc = exc_check()
  *         if exc:
  *             raise exc             # <<<<<<<<<<<<<<
@@ -4157,9 +4413,9 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_int(int __pyx_v_err) {
  *             # no error message from GDAL
  */
       __Pyx_Raise(__pyx_v_exc, 0, 0, 0);
-      __PYX_ERR(0, 195, __pyx_L1_error)
+      __PYX_ERR(0, 199, __pyx_L1_error)
 
-      /* "pyogrio/_err.pyx":194
+      /* "pyogrio/_err.pyx":198
  *     if err:
  *         exc = exc_check()
  *         if exc:             # <<<<<<<<<<<<<<
@@ -4168,7 +4424,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_int(int __pyx_v_err) {
  */
     }
 
-    /* "pyogrio/_err.pyx":198
+    /* "pyogrio/_err.pyx":202
  *         else:
  *             # no error message from GDAL
  *             raise CPLE_BaseError(-1, -1, "Unspecified OGR / GDAL error")             # <<<<<<<<<<<<<<
@@ -4176,17 +4432,17 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_int(int __pyx_v_err) {
  * 
  */
     /*else*/ {
-      __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 198, __pyx_L1_error)
+      __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 202, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 198, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 202, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_Raise(__pyx_t_3, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __PYX_ERR(0, 198, __pyx_L1_error)
+      __PYX_ERR(0, 202, __pyx_L1_error)
     }
 
-    /* "pyogrio/_err.pyx":192
+    /* "pyogrio/_err.pyx":196
  *     Copied from Fiona (_err.pyx).
  *     """
  *     if err:             # <<<<<<<<<<<<<<
@@ -4195,7 +4451,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_int(int __pyx_v_err) {
  */
   }
 
-  /* "pyogrio/_err.pyx":199
+  /* "pyogrio/_err.pyx":203
  *             # no error message from GDAL
  *             raise CPLE_BaseError(-1, -1, "Unspecified OGR / GDAL error")
  *     return err             # <<<<<<<<<<<<<<
@@ -4205,7 +4461,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_int(int __pyx_v_err) {
   __pyx_r = __pyx_v_err;
   goto __pyx_L0;
 
-  /* "pyogrio/_err.pyx":186
+  /* "pyogrio/_err.pyx":190
  * 
  * 
  * cdef int exc_wrap_int(int err) except -1:             # <<<<<<<<<<<<<<
@@ -4225,7 +4481,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_int(int __pyx_v_err) {
   return __pyx_r;
 }
 
-/* "pyogrio/_err.pyx":202
+/* "pyogrio/_err.pyx":206
  * 
  * 
  * cdef int exc_wrap_ogrerr(int err) except -1:             # <<<<<<<<<<<<<<
@@ -4248,7 +4504,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_ogrerr(int __pyx_v_err) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("exc_wrap_ogrerr", 1);
 
-  /* "pyogrio/_err.pyx":208
+  /* "pyogrio/_err.pyx":212
  *     Adapted from Fiona (_err.pyx).
  *     """
  *     if err != 0:             # <<<<<<<<<<<<<<
@@ -4258,20 +4514,20 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_ogrerr(int __pyx_v_err) {
   __pyx_t_1 = (__pyx_v_err != 0);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyogrio/_err.pyx":209
+    /* "pyogrio/_err.pyx":213
  *     """
  *     if err != 0:
  *         raise CPLE_BaseError(3, err, f"OGR Error code {err}")             # <<<<<<<<<<<<<<
  * 
  *     return err
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 209, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 213, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_err); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 209, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_err); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 213, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_5 = __Pyx_PyUnicode_From_int(__pyx_v_err, 0, ' ', 'd'); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 209, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyUnicode_From_int(__pyx_v_err, 0, ' ', 'd'); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 213, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
-    __pyx_t_6 = __Pyx_PyUnicode_Concat(__pyx_kp_u_OGR_Error_code, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 209, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyUnicode_Concat(__pyx_kp_u_OGR_Error_code, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 213, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_t_5 = NULL;
@@ -4294,15 +4550,15 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_ogrerr(int __pyx_v_err) {
       __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 209, __pyx_L1_error)
+      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 213, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(0, 209, __pyx_L1_error)
+    __PYX_ERR(0, 213, __pyx_L1_error)
 
-    /* "pyogrio/_err.pyx":208
+    /* "pyogrio/_err.pyx":212
  *     Adapted from Fiona (_err.pyx).
  *     """
  *     if err != 0:             # <<<<<<<<<<<<<<
@@ -4311,7 +4567,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_ogrerr(int __pyx_v_err) {
  */
   }
 
-  /* "pyogrio/_err.pyx":211
+  /* "pyogrio/_err.pyx":215
  *         raise CPLE_BaseError(3, err, f"OGR Error code {err}")
  * 
  *     return err             # <<<<<<<<<<<<<<
@@ -4321,7 +4577,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_ogrerr(int __pyx_v_err) {
   __pyx_r = __pyx_v_err;
   goto __pyx_L0;
 
-  /* "pyogrio/_err.pyx":202
+  /* "pyogrio/_err.pyx":206
  * 
  * 
  * cdef int exc_wrap_ogrerr(int err) except -1:             # <<<<<<<<<<<<<<
@@ -4343,7 +4599,7 @@ static int __pyx_f_7pyogrio_4_err_exc_wrap_ogrerr(int __pyx_v_err) {
   return __pyx_r;
 }
 
-/* "pyogrio/_err.pyx":214
+/* "pyogrio/_err.pyx":218
  * 
  * 
  * cdef void error_handler(CPLErr err_class, int err_no, const char* err_msg) nogil:             # <<<<<<<<<<<<<<
@@ -4368,7 +4624,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
   #endif
   __Pyx_RefNannySetupContext("error_handler", 1);
 
-  /* "pyogrio/_err.pyx":221
+  /* "pyogrio/_err.pyx":225
  *     that includes the error message.
  *     """
  *     if err_class == CE_Fatal:             # <<<<<<<<<<<<<<
@@ -4378,7 +4634,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
   switch (__pyx_v_err_class) {
     case CE_Fatal:
 
-    /* "pyogrio/_err.pyx":225
+    /* "pyogrio/_err.pyx":229
  *         # because the CPL support code does an abort() before any exception
  *         # can be generated
  *         CPLDefaultErrorHandler(err_class, err_no, err_msg)             # <<<<<<<<<<<<<<
@@ -4387,7 +4643,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
  */
     CPLDefaultErrorHandler(__pyx_v_err_class, __pyx_v_err_no, __pyx_v_err_msg);
 
-    /* "pyogrio/_err.pyx":226
+    /* "pyogrio/_err.pyx":230
  *         # can be generated
  *         CPLDefaultErrorHandler(err_class, err_no, err_msg)
  *         return             # <<<<<<<<<<<<<<
@@ -4396,7 +4652,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
  */
     goto __pyx_L0;
 
-    /* "pyogrio/_err.pyx":221
+    /* "pyogrio/_err.pyx":225
  *     that includes the error message.
  *     """
  *     if err_class == CE_Fatal:             # <<<<<<<<<<<<<<
@@ -4406,7 +4662,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
     break;
     case CE_Failure:
 
-    /* "pyogrio/_err.pyx":231
+    /* "pyogrio/_err.pyx":235
  *         # For Failures, do nothing as those are explicitly caught
  *         # with error return codes and translated into Python exceptions
  *         return             # <<<<<<<<<<<<<<
@@ -4415,7 +4671,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
  */
     goto __pyx_L0;
 
-    /* "pyogrio/_err.pyx":228
+    /* "pyogrio/_err.pyx":232
  *         return
  * 
  *     elif err_class == CE_Failure:             # <<<<<<<<<<<<<<
@@ -4425,7 +4681,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
     break;
     case CE_Warning:
 
-    /* "pyogrio/_err.pyx":234
+    /* "pyogrio/_err.pyx":238
  * 
  *     elif err_class == CE_Warning:
  *         with gil:             # <<<<<<<<<<<<<<
@@ -4438,7 +4694,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
         #endif
         /*try:*/ {
 
-          /* "pyogrio/_err.pyx":235
+          /* "pyogrio/_err.pyx":239
  *     elif err_class == CE_Warning:
  *         with gil:
  *             msg_b = err_msg             # <<<<<<<<<<<<<<
@@ -4447,29 +4703,29 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
  */
           __pyx_v_msg_b = __pyx_v_err_msg;
 
-          /* "pyogrio/_err.pyx":236
+          /* "pyogrio/_err.pyx":240
  *         with gil:
  *             msg_b = err_msg
  *             msg = msg_b.decode('utf-8')             # <<<<<<<<<<<<<<
  *             warnings.warn(msg, RuntimeWarning)
  *         return
  */
-          __pyx_t_1 = __Pyx_ssize_strlen(__pyx_v_msg_b); if (unlikely(__pyx_t_1 == ((Py_ssize_t)-1))) __PYX_ERR(0, 236, __pyx_L4_error)
-          __pyx_t_2 = __Pyx_decode_c_string(__pyx_v_msg_b, 0, __pyx_t_1, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 236, __pyx_L4_error)
+          __pyx_t_1 = __Pyx_ssize_strlen(__pyx_v_msg_b); if (unlikely(__pyx_t_1 == ((Py_ssize_t)-1))) __PYX_ERR(0, 240, __pyx_L4_error)
+          __pyx_t_2 = __Pyx_decode_c_string(__pyx_v_msg_b, 0, __pyx_t_1, NULL, NULL, PyUnicode_DecodeUTF8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 240, __pyx_L4_error)
           __Pyx_GOTREF(__pyx_t_2);
           __pyx_v_msg = __pyx_t_2;
           __pyx_t_2 = 0;
 
-          /* "pyogrio/_err.pyx":237
+          /* "pyogrio/_err.pyx":241
  *             msg_b = err_msg
  *             msg = msg_b.decode('utf-8')
  *             warnings.warn(msg, RuntimeWarning)             # <<<<<<<<<<<<<<
  *         return
  * 
  */
-          __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_warnings); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 237, __pyx_L4_error)
+          __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_warnings); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 241, __pyx_L4_error)
           __Pyx_GOTREF(__pyx_t_3);
-          __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_warn); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 237, __pyx_L4_error)
+          __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_warn); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 241, __pyx_L4_error)
           __Pyx_GOTREF(__pyx_t_4);
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
           __pyx_t_3 = NULL;
@@ -4490,14 +4746,14 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
             PyObject *__pyx_callargs[3] = {__pyx_t_3, __pyx_v_msg, __pyx_builtin_RuntimeWarning};
             __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
             __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-            if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 237, __pyx_L4_error)
+            if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 241, __pyx_L4_error)
             __Pyx_GOTREF(__pyx_t_2);
             __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
           }
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         }
 
-        /* "pyogrio/_err.pyx":234
+        /* "pyogrio/_err.pyx":238
  * 
  *     elif err_class == CE_Warning:
  *         with gil:             # <<<<<<<<<<<<<<
@@ -4521,7 +4777,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
         }
     }
 
-    /* "pyogrio/_err.pyx":238
+    /* "pyogrio/_err.pyx":242
  *             msg = msg_b.decode('utf-8')
  *             warnings.warn(msg, RuntimeWarning)
  *         return             # <<<<<<<<<<<<<<
@@ -4530,7 +4786,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
  */
     goto __pyx_L0;
 
-    /* "pyogrio/_err.pyx":233
+    /* "pyogrio/_err.pyx":237
  *         return
  * 
  *     elif err_class == CE_Warning:             # <<<<<<<<<<<<<<
@@ -4541,7 +4797,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
     default: break;
   }
 
-  /* "pyogrio/_err.pyx":242
+  /* "pyogrio/_err.pyx":246
  *     # Fall back to the default handler for non-failure messages since
  *     # they won't be translated into exceptions.
  *     CPLDefaultErrorHandler(err_class, err_no, err_msg)             # <<<<<<<<<<<<<<
@@ -4550,7 +4806,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
  */
   CPLDefaultErrorHandler(__pyx_v_err_class, __pyx_v_err_no, __pyx_v_err_msg);
 
-  /* "pyogrio/_err.pyx":214
+  /* "pyogrio/_err.pyx":218
  * 
  * 
  * cdef void error_handler(CPLErr err_class, int err_no, const char* err_msg) nogil:             # <<<<<<<<<<<<<<
@@ -4582,7 +4838,7 @@ static void __pyx_f_7pyogrio_4_err_error_handler(CPLErr __pyx_v_err_class, int _
   #endif
 }
 
-/* "pyogrio/_err.pyx":245
+/* "pyogrio/_err.pyx":249
  * 
  * 
  * def _register_error_handler():             # <<<<<<<<<<<<<<
@@ -4610,14 +4866,14 @@ static PyObject *__pyx_pf_7pyogrio_4_err__register_error_handler(CYTHON_UNUSED P
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_register_error_handler", 1);
 
-  /* "pyogrio/_err.pyx":246
+  /* "pyogrio/_err.pyx":250
  * 
  * def _register_error_handler():
  *     CPLPushErrorHandler(<CPLErrorHandler>error_handler)             # <<<<<<<<<<<<<<
  */
   CPLPushErrorHandler(((CPLErrorHandler)__pyx_f_7pyogrio_4_err_error_handler));
 
-  /* "pyogrio/_err.pyx":245
+  /* "pyogrio/_err.pyx":249
  * 
  * 
  * def _register_error_handler():             # <<<<<<<<<<<<<<
@@ -4669,6 +4925,7 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_CPLE_OpenFailedError, __pyx_k_CPLE_OpenFailedError, sizeof(__pyx_k_CPLE_OpenFailedError), 0, 0, 1, 1},
     {&__pyx_n_s_CPLE_OutOfMemoryError, __pyx_k_CPLE_OutOfMemoryError, sizeof(__pyx_k_CPLE_OutOfMemoryError), 0, 0, 1, 1},
     {&__pyx_n_s_CPLE_UserInterruptError, __pyx_k_CPLE_UserInterruptError, sizeof(__pyx_k_CPLE_UserInterruptError), 0, 0, 1, 1},
+    {&__pyx_kp_u_Could_not_decode_error_message_t, __pyx_k_Could_not_decode_error_message_t, sizeof(__pyx_k_Could_not_decode_error_message_t), 0, 1, 0, 0},
     {&__pyx_kp_u_Fatal_error_0, __pyx_k_Fatal_error_0, sizeof(__pyx_k_Fatal_error_0), 0, 1, 0, 0},
     {&__pyx_n_s_GDALError, __pyx_k_GDALError, sizeof(__pyx_k_GDALError), 0, 0, 1, 1},
     {&__pyx_n_s_IntEnum, __pyx_k_IntEnum, sizeof(__pyx_k_IntEnum), 0, 0, 1, 1},
@@ -4680,6 +4937,7 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_kp_s_Returned_from_exc_wrap_pointer, __pyx_k_Returned_from_exc_wrap_pointer, sizeof(__pyx_k_Returned_from_exc_wrap_pointer), 0, 0, 1, 0},
     {&__pyx_n_s_RuntimeWarning, __pyx_k_RuntimeWarning, sizeof(__pyx_k_RuntimeWarning), 0, 0, 1, 1},
     {&__pyx_n_s_SystemExit, __pyx_k_SystemExit, sizeof(__pyx_k_SystemExit), 0, 0, 1, 1},
+    {&__pyx_n_s_UnicodeDecodeError, __pyx_k_UnicodeDecodeError, sizeof(__pyx_k_UnicodeDecodeError), 0, 0, 1, 1},
     {&__pyx_kp_u_Unspecified_OGR_GDAL_error, __pyx_k_Unspecified_OGR_GDAL_error, sizeof(__pyx_k_Unspecified_OGR_GDAL_error), 0, 1, 0, 0},
     {&__pyx_kp_u__10, __pyx_k__10, sizeof(__pyx_k__10), 0, 1, 0, 0},
     {&__pyx_n_s__11, __pyx_k__11, sizeof(__pyx_k__11), 0, 0, 1, 1},
@@ -4738,8 +4996,9 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
 /* #### Code section: cached_builtins ### */
 static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
   __pyx_builtin_property = __Pyx_GetBuiltinName(__pyx_n_s_property); if (!__pyx_builtin_property) __PYX_ERR(0, 37, __pyx_L1_error)
-  __pyx_builtin_SystemExit = __Pyx_GetBuiltinName(__pyx_n_s_SystemExit); if (!__pyx_builtin_SystemExit) __PYX_ERR(0, 166, __pyx_L1_error)
-  __pyx_builtin_RuntimeWarning = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeWarning); if (!__pyx_builtin_RuntimeWarning) __PYX_ERR(0, 237, __pyx_L1_error)
+  __pyx_builtin_UnicodeDecodeError = __Pyx_GetBuiltinName(__pyx_n_s_UnicodeDecodeError); if (!__pyx_builtin_UnicodeDecodeError) __PYX_ERR(0, 161, __pyx_L1_error)
+  __pyx_builtin_SystemExit = __Pyx_GetBuiltinName(__pyx_n_s_SystemExit); if (!__pyx_builtin_SystemExit) __PYX_ERR(0, 170, __pyx_L1_error)
+  __pyx_builtin_RuntimeWarning = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeWarning); if (!__pyx_builtin_RuntimeWarning) __PYX_ERR(0, 241, __pyx_L1_error)
   return 0;
   __pyx_L1_error:;
   return -1;
@@ -4750,47 +5009,47 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
 
-  /* "pyogrio/_err.pyx":157
- *         msg_b = err_msg
- *         msg = msg_b.decode('utf-8')
- *         msg = msg.replace("`", "'")             # <<<<<<<<<<<<<<
- *         msg = msg.replace("\n", " ")
- * 
+  /* "pyogrio/_err.pyx":159
+ *         try:
+ *             msg = msg_b.decode('utf-8')
+ *             msg = msg.replace("`", "'")             # <<<<<<<<<<<<<<
+ *             msg = msg.replace("\n", " ")
+ *         except UnicodeDecodeError as exc:
  */
-  __pyx_tuple__4 = PyTuple_Pack(2, __pyx_kp_u__2, __pyx_kp_u__3); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 157, __pyx_L1_error)
+  __pyx_tuple__4 = PyTuple_Pack(2, __pyx_kp_u__2, __pyx_kp_u__3); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 159, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__4);
   __Pyx_GIVEREF(__pyx_tuple__4);
 
-  /* "pyogrio/_err.pyx":158
- *         msg = msg_b.decode('utf-8')
- *         msg = msg.replace("`", "'")
- *         msg = msg.replace("\n", " ")             # <<<<<<<<<<<<<<
- * 
- *     if err_type == 3:
+  /* "pyogrio/_err.pyx":160
+ *             msg = msg_b.decode('utf-8')
+ *             msg = msg.replace("`", "'")
+ *             msg = msg.replace("\n", " ")             # <<<<<<<<<<<<<<
+ *         except UnicodeDecodeError as exc:
+ *             msg = f"Could not decode error message to UTF-8.  Raw error: {msg_b}"
  */
-  __pyx_tuple__7 = PyTuple_Pack(2, __pyx_kp_u__5, __pyx_kp_u__6); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 158, __pyx_L1_error)
+  __pyx_tuple__7 = PyTuple_Pack(2, __pyx_kp_u__5, __pyx_kp_u__6); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 160, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__7);
   __Pyx_GIVEREF(__pyx_tuple__7);
 
-  /* "pyogrio/_err.pyx":182
+  /* "pyogrio/_err.pyx":186
  *         else:
  *             # null pointer was passed, but no error message from GDAL
  *             raise NullPointerError(-1, -1, "NULL pointer error")             # <<<<<<<<<<<<<<
  *     return ptr
  * 
  */
-  __pyx_tuple__8 = PyTuple_Pack(3, __pyx_int_neg_1, __pyx_int_neg_1, __pyx_kp_u_NULL_pointer_error); if (unlikely(!__pyx_tuple__8)) __PYX_ERR(0, 182, __pyx_L1_error)
+  __pyx_tuple__8 = PyTuple_Pack(3, __pyx_int_neg_1, __pyx_int_neg_1, __pyx_kp_u_NULL_pointer_error); if (unlikely(!__pyx_tuple__8)) __PYX_ERR(0, 186, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__8);
   __Pyx_GIVEREF(__pyx_tuple__8);
 
-  /* "pyogrio/_err.pyx":198
+  /* "pyogrio/_err.pyx":202
  *         else:
  *             # no error message from GDAL
  *             raise CPLE_BaseError(-1, -1, "Unspecified OGR / GDAL error")             # <<<<<<<<<<<<<<
  *     return err
  * 
  */
-  __pyx_tuple__9 = PyTuple_Pack(3, __pyx_int_neg_1, __pyx_int_neg_1, __pyx_kp_u_Unspecified_OGR_GDAL_error); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 198, __pyx_L1_error)
+  __pyx_tuple__9 = PyTuple_Pack(3, __pyx_int_neg_1, __pyx_int_neg_1, __pyx_kp_u_Unspecified_OGR_GDAL_error); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 202, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__9);
   __Pyx_GIVEREF(__pyx_tuple__9);
 
@@ -4836,13 +5095,13 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  */
   __pyx_codeobj__17 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__14, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__err_pyx, __pyx_n_s_args, 37, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__17)) __PYX_ERR(0, 37, __pyx_L1_error)
 
-  /* "pyogrio/_err.pyx":245
+  /* "pyogrio/_err.pyx":249
  * 
  * 
  * def _register_error_handler():             # <<<<<<<<<<<<<<
  *     CPLPushErrorHandler(<CPLErrorHandler>error_handler)
  */
-  __pyx_codeobj__18 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 0, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__err_pyx, __pyx_n_s_register_error_handler, 245, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__18)) __PYX_ERR(0, 245, __pyx_L1_error)
+  __pyx_codeobj__18 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 0, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__err_pyx, __pyx_n_s_register_error_handler, 249, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__18)) __PYX_ERR(0, 249, __pyx_L1_error)
   __Pyx_RefNannyFinishContext();
   return 0;
   __pyx_L1_error:;
@@ -5147,7 +5406,7 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec__err(PyObject *__pyx_pyinit_module
   __pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
   {
     int add_module_result = PyState_AddModule(__pyx_t_1, &__pyx_moduledef);
-    __pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to _err pseudovariable */
+    __pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to "_err" pseudovariable */
     if (unlikely((add_module_result < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
     pystate_addmodule_run = 1;
   }
@@ -5159,10 +5418,8 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec__err(PyObject *__pyx_pyinit_module
   CYTHON_UNUSED_VAR(__pyx_t_1);
   __pyx_d = PyModule_GetDict(__pyx_m); if (unlikely(!__pyx_d)) __PYX_ERR(0, 1, __pyx_L1_error)
   Py_INCREF(__pyx_d);
-  __pyx_b = PyImport_AddModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_b)) __PYX_ERR(0, 1, __pyx_L1_error)
-  Py_INCREF(__pyx_b);
-  __pyx_cython_runtime = PyImport_AddModule((char *) "cython_runtime"); if (unlikely(!__pyx_cython_runtime)) __PYX_ERR(0, 1, __pyx_L1_error)
-  Py_INCREF(__pyx_cython_runtime);
+  __pyx_b = __Pyx_PyImport_AddModuleRef(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_b)) __PYX_ERR(0, 1, __pyx_L1_error)
+  __pyx_cython_runtime = __Pyx_PyImport_AddModuleRef((const char *) "cython_runtime"); if (unlikely(!__pyx_cython_runtime)) __PYX_ERR(0, 1, __pyx_L1_error)
   if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   #if CYTHON_REFNANNY
 __Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny");
@@ -6200,15 +6457,15 @@ if (!__Pyx_RefNanny) {
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_exception_map, __pyx_t_4) < 0) __PYX_ERR(0, 116, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyogrio/_err.pyx":245
+  /* "pyogrio/_err.pyx":249
  * 
  * 
  * def _register_error_handler():             # <<<<<<<<<<<<<<
  *     CPLPushErrorHandler(<CPLErrorHandler>error_handler)
  */
-  __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_err_1_register_error_handler, 0, __pyx_n_s_register_error_handler, NULL, __pyx_n_s_pyogrio__err, __pyx_d, ((PyObject *)__pyx_codeobj__18)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 245, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_err_1_register_error_handler, 0, __pyx_n_s_register_error_handler, NULL, __pyx_n_s_pyogrio__err, __pyx_d, ((PyObject *)__pyx_codeobj__18)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_register_error_handler, __pyx_t_4) < 0) __PYX_ERR(0, 245, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_register_error_handler, __pyx_t_4) < 0) __PYX_ERR(0, 249, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
   /* "pyogrio/_err.pyx":1
@@ -6410,14 +6667,20 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject
 #endif
 
 /* PyObjectGetAttrStrNoError */
+#if __PYX_LIMITED_VERSION_HEX < 0x030d00A1
 static void __Pyx_PyObject_GetAttrStr_ClearAttributeError(void) {
     __Pyx_PyThreadState_declare
     __Pyx_PyThreadState_assign
     if (likely(__Pyx_PyErr_ExceptionMatches(PyExc_AttributeError)))
         __Pyx_PyErr_Clear();
 }
+#endif
 static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStrNoError(PyObject* obj, PyObject* attr_name) {
     PyObject *result;
+#if __PYX_LIMITED_VERSION_HEX >= 0x030d00A1
+    (void) PyObject_GetOptionalAttr(obj, attr_name, &result);
+    return result;
+#else
 #if CYTHON_COMPILING_IN_CPYTHON && CYTHON_USE_TYPE_SLOTS && PY_VERSION_HEX >= 0x030700B1
     PyTypeObject* tp = Py_TYPE(obj);
     if (likely(tp->tp_getattro == PyObject_GenericGetAttr)) {
@@ -6429,6 +6692,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStrNoError(PyObject* obj, P
         __Pyx_PyObject_GetAttrStr_ClearAttributeError();
     }
     return result;
+#endif
 }
 
 /* GetBuiltinName */
@@ -6644,13 +6908,31 @@ static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyO
     {
         int eq = __Pyx_PyUnicode_Equals(s, PyTuple_GET_ITEM(kwnames, i), Py_EQ);
         if (unlikely(eq != 0)) {
-            if (unlikely(eq < 0)) return NULL;  // error
+            if (unlikely(eq < 0)) return NULL;
             return kwvalues[i];
         }
     }
-    return NULL;  // not found (no exception set)
+    return NULL;
+}
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
+CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
+    Py_ssize_t i, nkwargs = PyTuple_GET_SIZE(kwnames);
+    PyObject *dict;
+    dict = PyDict_New();
+    if (unlikely(!dict))
+        return NULL;
+    for (i=0; i<nkwargs; i++) {
+        PyObject *key = PyTuple_GET_ITEM(kwnames, i);
+        if (unlikely(PyDict_SetItem(dict, key, kwvalues[i]) < 0))
+            goto bad;
+    }
+    return dict;
+bad:
+    Py_DECREF(dict);
+    return NULL;
 }
 #endif
+#endif
 
 /* RaiseArgTupleInvalid */
 static void __Pyx_RaiseArgtupleInvalid(
@@ -6743,7 +7025,7 @@ static int __Pyx_ParseOptionalKeywords(
         if (*name) {
             values[name-argnames] = value;
 #if CYTHON_AVOID_BORROWED_REFS
-            Py_INCREF(value); // transfer ownership of value to values
+            Py_INCREF(value);
             Py_DECREF(key);
 #endif
             key = NULL;
@@ -6762,7 +7044,7 @@ static int __Pyx_ParseOptionalKeywords(
                         && _PyString_Eq(**name, key)) {
                     values[name-argnames] = value;
 #if CYTHON_AVOID_BORROWED_REFS
-                    value = NULL;  // ownership transferred to values
+                    value = NULL;
 #endif
                     break;
                 }
@@ -6794,7 +7076,7 @@ static int __Pyx_ParseOptionalKeywords(
                 if (cmp == 0) {
                     values[name-argnames] = value;
 #if CYTHON_AVOID_BORROWED_REFS
-                    value = NULL; // ownership transferred to values
+                    value = NULL;
 #endif
                     break;
                 }
@@ -6907,9 +7189,15 @@ static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args,
     PyObject *result;
     assert(kwargs == NULL || PyDict_Check(kwargs));
     nk = kwargs ? PyDict_Size(kwargs) : 0;
+    #if PY_MAJOR_VERSION < 3
     if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object"))) {
         return NULL;
     }
+    #else
+    if (unlikely(Py_EnterRecursiveCall(" while calling a Python object"))) {
+        return NULL;
+    }
+    #endif
     if (
 #if PY_MAJOR_VERSION >= 3
             co->co_kwonlyargcount == 0 &&
@@ -6986,8 +7274,13 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg
     ternaryfunc call = Py_TYPE(func)->tp_call;
     if (unlikely(!call))
         return PyObject_Call(func, arg, kw);
+    #if PY_MAJOR_VERSION < 3
     if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object")))
         return NULL;
+    #else
+    if (unlikely(Py_EnterRecursiveCall(" while calling a Python object")))
+        return NULL;
+    #endif
     result = (*call)(func, arg, kw);
     Py_LeaveRecursiveCall();
     if (unlikely(!result) && unlikely(!PyErr_Occurred())) {
@@ -7006,8 +7299,13 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject
     PyCFunction cfunc;
     cfunc = __Pyx_CyOrPyCFunction_GET_FUNCTION(func);
     self = __Pyx_CyOrPyCFunction_GET_SELF(func);
+    #if PY_MAJOR_VERSION < 3
     if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object")))
         return NULL;
+    #else
+    if (unlikely(Py_EnterRecursiveCall(" while calling a Python object")))
+        return NULL;
+    #endif
     result = cfunc(self, arg);
     Py_LeaveRecursiveCall();
     if (unlikely(!result) && unlikely(!PyErr_Occurred())) {
@@ -7072,7 +7370,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_FastCallDict(PyObject *func, PyObj
     #endif
     if (kwargs == NULL) {
         #if CYTHON_VECTORCALL
-        #if Py_VERSION_HEX < 0x03090000
+        #if PY_VERSION_HEX < 0x03090000
         vectorcallfunc f = _PyVectorcall_Function(func);
         #else
         vectorcallfunc f = PyVectorcall_Function(func);
@@ -7130,6 +7428,237 @@ static CYTHON_INLINE PyObject* __Pyx_decode_c_string(
     }
 }
 
+/* GetTopmostException */
+#if CYTHON_USE_EXC_INFO_STACK && CYTHON_FAST_THREAD_STATE
+static _PyErr_StackItem *
+__Pyx_PyErr_GetTopmostException(PyThreadState *tstate)
+{
+    _PyErr_StackItem *exc_info = tstate->exc_info;
+    while ((exc_info->exc_value == NULL || exc_info->exc_value == Py_None) &&
+           exc_info->previous_item != NULL)
+    {
+        exc_info = exc_info->previous_item;
+    }
+    return exc_info;
+}
+#endif
+
+/* SaveResetException */
+#if CYTHON_FAST_THREAD_STATE
+static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {
+  #if CYTHON_USE_EXC_INFO_STACK && PY_VERSION_HEX >= 0x030B00a4
+    _PyErr_StackItem *exc_info = __Pyx_PyErr_GetTopmostException(tstate);
+    PyObject *exc_value = exc_info->exc_value;
+    if (exc_value == NULL || exc_value == Py_None) {
+        *value = NULL;
+        *type = NULL;
+        *tb = NULL;
+    } else {
+        *value = exc_value;
+        Py_INCREF(*value);
+        *type = (PyObject*) Py_TYPE(exc_value);
+        Py_INCREF(*type);
+        *tb = PyException_GetTraceback(exc_value);
+    }
+  #elif CYTHON_USE_EXC_INFO_STACK
+    _PyErr_StackItem *exc_info = __Pyx_PyErr_GetTopmostException(tstate);
+    *type = exc_info->exc_type;
+    *value = exc_info->exc_value;
+    *tb = exc_info->exc_traceback;
+    Py_XINCREF(*type);
+    Py_XINCREF(*value);
+    Py_XINCREF(*tb);
+  #else
+    *type = tstate->exc_type;
+    *value = tstate->exc_value;
+    *tb = tstate->exc_traceback;
+    Py_XINCREF(*type);
+    Py_XINCREF(*value);
+    Py_XINCREF(*tb);
+  #endif
+}
+static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) {
+  #if CYTHON_USE_EXC_INFO_STACK && PY_VERSION_HEX >= 0x030B00a4
+    _PyErr_StackItem *exc_info = tstate->exc_info;
+    PyObject *tmp_value = exc_info->exc_value;
+    exc_info->exc_value = value;
+    Py_XDECREF(tmp_value);
+    Py_XDECREF(type);
+    Py_XDECREF(tb);
+  #else
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+    #if CYTHON_USE_EXC_INFO_STACK
+    _PyErr_StackItem *exc_info = tstate->exc_info;
+    tmp_type = exc_info->exc_type;
+    tmp_value = exc_info->exc_value;
+    tmp_tb = exc_info->exc_traceback;
+    exc_info->exc_type = type;
+    exc_info->exc_value = value;
+    exc_info->exc_traceback = tb;
+    #else
+    tmp_type = tstate->exc_type;
+    tmp_value = tstate->exc_value;
+    tmp_tb = tstate->exc_traceback;
+    tstate->exc_type = type;
+    tstate->exc_value = value;
+    tstate->exc_traceback = tb;
+    #endif
+    Py_XDECREF(tmp_type);
+    Py_XDECREF(tmp_value);
+    Py_XDECREF(tmp_tb);
+  #endif
+}
+#endif
+
+/* GetException */
+#if CYTHON_FAST_THREAD_STATE
+static int __Pyx__GetException(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb)
+#else
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb)
+#endif
+{
+    PyObject *local_type = NULL, *local_value, *local_tb = NULL;
+#if CYTHON_FAST_THREAD_STATE
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+  #if PY_VERSION_HEX >= 0x030C00A6
+    local_value = tstate->current_exception;
+    tstate->current_exception = 0;
+    if (likely(local_value)) {
+        local_type = (PyObject*) Py_TYPE(local_value);
+        Py_INCREF(local_type);
+        local_tb = PyException_GetTraceback(local_value);
+    }
+  #else
+    local_type = tstate->curexc_type;
+    local_value = tstate->curexc_value;
+    local_tb = tstate->curexc_traceback;
+    tstate->curexc_type = 0;
+    tstate->curexc_value = 0;
+    tstate->curexc_traceback = 0;
+  #endif
+#else
+    PyErr_Fetch(&local_type, &local_value, &local_tb);
+#endif
+    PyErr_NormalizeException(&local_type, &local_value, &local_tb);
+#if CYTHON_FAST_THREAD_STATE && PY_VERSION_HEX >= 0x030C00A6
+    if (unlikely(tstate->current_exception))
+#elif CYTHON_FAST_THREAD_STATE
+    if (unlikely(tstate->curexc_type))
+#else
+    if (unlikely(PyErr_Occurred()))
+#endif
+        goto bad;
+    #if PY_MAJOR_VERSION >= 3
+    if (local_tb) {
+        if (unlikely(PyException_SetTraceback(local_value, local_tb) < 0))
+            goto bad;
+    }
+    #endif
+    Py_XINCREF(local_tb);
+    Py_XINCREF(local_type);
+    Py_XINCREF(local_value);
+    *type = local_type;
+    *value = local_value;
+    *tb = local_tb;
+#if CYTHON_FAST_THREAD_STATE
+    #if CYTHON_USE_EXC_INFO_STACK
+    {
+        _PyErr_StackItem *exc_info = tstate->exc_info;
+      #if PY_VERSION_HEX >= 0x030B00a4
+        tmp_value = exc_info->exc_value;
+        exc_info->exc_value = local_value;
+        tmp_type = NULL;
+        tmp_tb = NULL;
+        Py_XDECREF(local_type);
+        Py_XDECREF(local_tb);
+      #else
+        tmp_type = exc_info->exc_type;
+        tmp_value = exc_info->exc_value;
+        tmp_tb = exc_info->exc_traceback;
+        exc_info->exc_type = local_type;
+        exc_info->exc_value = local_value;
+        exc_info->exc_traceback = local_tb;
+      #endif
+    }
+    #else
+    tmp_type = tstate->exc_type;
+    tmp_value = tstate->exc_value;
+    tmp_tb = tstate->exc_traceback;
+    tstate->exc_type = local_type;
+    tstate->exc_value = local_value;
+    tstate->exc_traceback = local_tb;
+    #endif
+    Py_XDECREF(tmp_type);
+    Py_XDECREF(tmp_value);
+    Py_XDECREF(tmp_tb);
+#else
+    PyErr_SetExcInfo(local_type, local_value, local_tb);
+#endif
+    return 0;
+bad:
+    *type = 0;
+    *value = 0;
+    *tb = 0;
+    Py_XDECREF(local_type);
+    Py_XDECREF(local_value);
+    Py_XDECREF(local_tb);
+    return -1;
+}
+
+/* SwapException */
+#if CYTHON_FAST_THREAD_STATE
+static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+  #if CYTHON_USE_EXC_INFO_STACK && PY_VERSION_HEX >= 0x030B00a4
+    _PyErr_StackItem *exc_info = tstate->exc_info;
+    tmp_value = exc_info->exc_value;
+    exc_info->exc_value = *value;
+    if (tmp_value == NULL || tmp_value == Py_None) {
+        Py_XDECREF(tmp_value);
+        tmp_value = NULL;
+        tmp_type = NULL;
+        tmp_tb = NULL;
+    } else {
+        tmp_type = (PyObject*) Py_TYPE(tmp_value);
+        Py_INCREF(tmp_type);
+        #if CYTHON_COMPILING_IN_CPYTHON
+        tmp_tb = ((PyBaseExceptionObject*) tmp_value)->traceback;
+        Py_XINCREF(tmp_tb);
+        #else
+        tmp_tb = PyException_GetTraceback(tmp_value);
+        #endif
+    }
+  #elif CYTHON_USE_EXC_INFO_STACK
+    _PyErr_StackItem *exc_info = tstate->exc_info;
+    tmp_type = exc_info->exc_type;
+    tmp_value = exc_info->exc_value;
+    tmp_tb = exc_info->exc_traceback;
+    exc_info->exc_type = *type;
+    exc_info->exc_value = *value;
+    exc_info->exc_traceback = *tb;
+  #else
+    tmp_type = tstate->exc_type;
+    tmp_value = tstate->exc_value;
+    tmp_tb = tstate->exc_traceback;
+    tstate->exc_type = *type;
+    tstate->exc_value = *value;
+    tstate->exc_traceback = *tb;
+  #endif
+    *type = tmp_type;
+    *value = tmp_value;
+    *tb = tmp_tb;
+}
+#else
+static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb) {
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+    PyErr_GetExcInfo(&tmp_type, &tmp_value, &tmp_tb);
+    PyErr_SetExcInfo(*type, *value, *tb);
+    *type = tmp_type;
+    *value = tmp_value;
+    *tb = tmp_tb;
+}
+#endif
+
 /* PyDictVersioning */
 #if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS
 static CYTHON_INLINE PY_UINT64_T __Pyx_get_tp_dict_version(PyObject *obj) {
@@ -7165,7 +7694,7 @@ static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name)
 {
     PyObject *result;
 #if !CYTHON_AVOID_BORROWED_REFS
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1 && PY_VERSION_HEX < 0x030d0000
     result = _PyDict_GetItem_KnownHash(__pyx_d, name, ((PyASCIIObject *) name)->hash);
     __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version)
     if (likely(result)) {
@@ -8200,10 +8729,7 @@ static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject
 
 /* FetchSharedCythonModule */
 static PyObject *__Pyx_FetchSharedCythonABIModule(void) {
-    PyObject *abi_module = PyImport_AddModule((char*) __PYX_ABI_MODULE_NAME);
-    if (unlikely(!abi_module)) return NULL;
-    Py_INCREF(abi_module);
-    return abi_module;
+    return __Pyx_PyImport_AddModuleRef((char*) __PYX_ABI_MODULE_NAME);
 }
 
 /* FetchCommonType */
@@ -9187,7 +9713,7 @@ static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS(PyObject *func,
     default:
         return NULL;
     }
-    return ((_PyCFunctionFastWithKeywords)(void(*)(void))def->ml_meth)(self, args, nargs, kwnames);
+    return ((__Pyx_PyCFunctionFastWithKeywords)(void(*)(void))def->ml_meth)(self, args, nargs, kwnames);
 }
 static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS_METHOD(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
 {
@@ -9526,8 +10052,8 @@ static PyObject *__Pyx_PyCode_Replace_For_AddTraceback(PyObject *code, PyObject
         Py_DECREF(replace);
         return result;
     }
-    #if __PYX_LIMITED_VERSION_HEX < 0x030780000
     PyErr_Clear();
+    #if __PYX_LIMITED_VERSION_HEX < 0x030780000
     {
         PyObject *compiled = NULL, *result = NULL;
         if (unlikely(PyDict_SetItemString(scratch_dict, "code", code))) return NULL;
@@ -9547,6 +10073,8 @@ static PyObject *__Pyx_PyCode_Replace_For_AddTraceback(PyObject *code, PyObject
         if (result) Py_INCREF(result);
         return result;
     }
+    #else
+    return NULL;
     #endif
 }
 static void __Pyx_AddTraceback(const char *funcname, int c_line,
@@ -9644,7 +10172,7 @@ static PyCodeObject* __Pyx_CreateCodeObjectForTraceback(
     #else
     py_code = PyCode_NewEmpty(filename, funcname, py_line);
     #endif
-    Py_XDECREF(py_funcname);  // XDECREF since it's only set on Py3 if cline
+    Py_XDECREF(py_funcname);
     return py_code;
 bad:
     Py_XDECREF(py_funcname);
@@ -9726,13 +10254,13 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_CPLErr(CPLErr value) {
     {
         int one = 1; int little = (int)*(unsigned char *)&one;
         unsigned char *bytes = (unsigned char *)&value;
-#if !CYTHON_COMPILING_IN_LIMITED_API
+#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000
         return _PyLong_FromByteArray(bytes, sizeof(CPLErr),
                                      little, !is_unsigned);
 #else
         PyObject *from_bytes, *result = NULL;
         PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
-        from_bytes = PyObject_GetAttrString((PyObject*)&PyInt_Type, "from_bytes");
+        from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes");
         if (!from_bytes) return NULL;
         py_bytes = PyBytes_FromStringAndSize((char*)bytes, sizeof(CPLErr));
         if (!py_bytes) goto limited_bad;
@@ -9740,16 +10268,18 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_CPLErr(CPLErr value) {
         if (!order_str) goto limited_bad;
         arg_tuple = PyTuple_Pack(2, py_bytes, order_str);
         if (!arg_tuple) goto limited_bad;
-        kwds = PyDict_New();
-        if (!kwds) goto limited_bad;
-        if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(!is_unsigned ? Py_True : Py_False))) goto limited_bad;
+        if (!is_unsigned) {
+            kwds = PyDict_New();
+            if (!kwds) goto limited_bad;
+            if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(Py_True))) goto limited_bad;
+        }
         result = PyObject_Call(from_bytes, arg_tuple, kwds);
         limited_bad:
-        Py_XDECREF(from_bytes);
-        Py_XDECREF(py_bytes);
-        Py_XDECREF(order_str);
-        Py_XDECREF(arg_tuple);
         Py_XDECREF(kwds);
+        Py_XDECREF(arg_tuple);
+        Py_XDECREF(order_str);
+        Py_XDECREF(py_bytes);
+        Py_XDECREF(from_bytes);
         return result;
 #endif
     }
@@ -9788,13 +10318,13 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) {
     {
         int one = 1; int little = (int)*(unsigned char *)&one;
         unsigned char *bytes = (unsigned char *)&value;
-#if !CYTHON_COMPILING_IN_LIMITED_API
+#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000
         return _PyLong_FromByteArray(bytes, sizeof(int),
                                      little, !is_unsigned);
 #else
         PyObject *from_bytes, *result = NULL;
         PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
-        from_bytes = PyObject_GetAttrString((PyObject*)&PyInt_Type, "from_bytes");
+        from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes");
         if (!from_bytes) return NULL;
         py_bytes = PyBytes_FromStringAndSize((char*)bytes, sizeof(int));
         if (!py_bytes) goto limited_bad;
@@ -9802,16 +10332,18 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) {
         if (!order_str) goto limited_bad;
         arg_tuple = PyTuple_Pack(2, py_bytes, order_str);
         if (!arg_tuple) goto limited_bad;
-        kwds = PyDict_New();
-        if (!kwds) goto limited_bad;
-        if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(!is_unsigned ? Py_True : Py_False))) goto limited_bad;
+        if (!is_unsigned) {
+            kwds = PyDict_New();
+            if (!kwds) goto limited_bad;
+            if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(Py_True))) goto limited_bad;
+        }
         result = PyObject_Call(from_bytes, arg_tuple, kwds);
         limited_bad:
-        Py_XDECREF(from_bytes);
-        Py_XDECREF(py_bytes);
-        Py_XDECREF(order_str);
-        Py_XDECREF(arg_tuple);
         Py_XDECREF(kwds);
+        Py_XDECREF(arg_tuple);
+        Py_XDECREF(order_str);
+        Py_XDECREF(py_bytes);
+        Py_XDECREF(from_bytes);
         return result;
 #endif
     }
@@ -9866,13 +10398,13 @@ 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
+#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000
         return _PyLong_FromByteArray(bytes, sizeof(long),
                                      little, !is_unsigned);
 #else
         PyObject *from_bytes, *result = NULL;
         PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
-        from_bytes = PyObject_GetAttrString((PyObject*)&PyInt_Type, "from_bytes");
+        from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes");
         if (!from_bytes) return NULL;
         py_bytes = PyBytes_FromStringAndSize((char*)bytes, sizeof(long));
         if (!py_bytes) goto limited_bad;
@@ -9880,16 +10412,18 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) {
         if (!order_str) goto limited_bad;
         arg_tuple = PyTuple_Pack(2, py_bytes, order_str);
         if (!arg_tuple) goto limited_bad;
-        kwds = PyDict_New();
-        if (!kwds) goto limited_bad;
-        if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(!is_unsigned ? Py_True : Py_False))) goto limited_bad;
+        if (!is_unsigned) {
+            kwds = PyDict_New();
+            if (!kwds) goto limited_bad;
+            if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(Py_True))) goto limited_bad;
+        }
         result = PyObject_Call(from_bytes, arg_tuple, kwds);
         limited_bad:
-        Py_XDECREF(from_bytes);
-        Py_XDECREF(py_bytes);
-        Py_XDECREF(order_str);
-        Py_XDECREF(arg_tuple);
         Py_XDECREF(kwds);
+        Py_XDECREF(arg_tuple);
+        Py_XDECREF(order_str);
+        Py_XDECREF(py_bytes);
+        Py_XDECREF(from_bytes);
         return result;
 #endif
     }
@@ -10087,7 +10621,7 @@ static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) {
 #endif
             if (likely(v)) {
                 int ret = -1;
-#if !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
+#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,
@@ -10360,7 +10894,7 @@ static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {
 #endif
             if (likely(v)) {
                 int ret = -1;
-#if !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
+#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,
@@ -10580,7 +11114,7 @@ static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObj
 #endif
 
 /* CheckBinaryVersion */
-static unsigned long __Pyx_get_runtime_version() {
+static unsigned long __Pyx_get_runtime_version(void) {
 #if __PYX_LIMITED_VERSION_HEX >= 0x030B00A4
     return Py_Version & ~0xFFUL;
 #else