pyogrio 0.10.0__cp311-cp311-win_amd64.whl → 0.11.0__cp311-cp311-win_amd64.whl

pyogrio/_ogr.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 3.0.11 */
+/* Generated by Cython 3.0.12 */
 
 /* BEGIN: Cython Metadata
 {
@@ -58,10 +58,10 @@ END: Cython Metadata */
 #else
 #define __PYX_EXTRA_ABI_MODULE_NAME ""
 #endif
-#define CYTHON_ABI "3_0_11" __PYX_EXTRA_ABI_MODULE_NAME
+#define CYTHON_ABI "3_0_12" __PYX_EXTRA_ABI_MODULE_NAME
 #define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
 #define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
-#define CYTHON_HEX_VERSION 0x03000BF0
+#define CYTHON_HEX_VERSION 0x03000CF0
 #define CYTHON_FUTURE_DIVISION 1
 #include <stddef.h>
 #ifndef offsetof
@@ -1515,6 +1515,7 @@ static const char *__pyx_filename;
 
 static const char *__pyx_f[] = {
   "pyogrio\\\\_ogr.pyx",
+  "pyogrio\\\\_err.pxd",
 };
 /* #### Code section: utility_code_proto_before_types ### */
 /* ForceInitThreads.proto */
@@ -1527,9 +1528,10 @@ static const char *__pyx_f[] = {
 /* #### Code section: type_declarations ### */
 
 /*--- Type declarations ---*/
+struct __pyx_obj_7pyogrio_4_err_ErrorHandler;
 struct __pyx_opt_args_7pyogrio_4_ogr_get_string;
 
-/* "pyogrio/_ogr.pxd":452
+/* "pyogrio/_ogr.pxd":514
  * 
  * 
  * cdef get_string(const char *c_str, str encoding=*)             # <<<<<<<<<<<<<<
@@ -1538,6 +1540,28 @@ struct __pyx_opt_args_7pyogrio_4_ogr_get_string {
   int __pyx_n;
   PyObject *encoding;
 };
+
+/* "pyogrio/_err.pxd":5
+ * cdef void *check_pointer(void *ptr) except NULL
+ * 
+ * cdef class ErrorHandler:             # <<<<<<<<<<<<<<
+ *     cdef object error_stack
+ *     cdef int check_int(self, int retval, bint squash_errors) except -1
+ */
+struct __pyx_obj_7pyogrio_4_err_ErrorHandler {
+  PyObject_HEAD
+  struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler *__pyx_vtab;
+  PyObject *error_stack;
+};
+
+
+
+struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler {
+  int (*check_int)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, int, int);
+  void *(*check_pointer)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, void *, int);
+  void (*_handle_error_stack)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, int);
+};
+static struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler *__pyx_vtabptr_7pyogrio_4_err_ErrorHandler;
 /* #### Code section: utility_code_proto ### */
 
 /* --- Runtime support code (head) --- */
@@ -1699,7 +1723,7 @@ static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args,
 #if !CYTHON_VECTORCALL
 #if PY_VERSION_HEX >= 0x03080000
   #include "frameobject.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
+#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif
@@ -1938,6 +1962,38 @@ static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_ve
 static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name);
 #endif
 
+/* RaiseException.proto */
+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause);
+
+/* 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
+
+/* JoinPyUnicode.proto */
+static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_count, Py_ssize_t result_ulength,
+                                      Py_UCS4 max_char);
+
+/* RaiseUnexpectedTypeError.proto */
+static int __Pyx_RaiseUnexpectedTypeError(const char *expected, PyObject *obj);
+
 /* GetTopmostException.proto */
 #if CYTHON_USE_EXC_INFO_STACK && CYTHON_FAST_THREAD_STATE
 static _PyErr_StackItem * __Pyx_PyErr_GetTopmostException(PyThreadState *tstate);
@@ -1987,38 +2043,6 @@ static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject *
 static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb);
 #endif
 
-/* RaiseException.proto */
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause);
-
-/* 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
-
-/* JoinPyUnicode.proto */
-static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_count, Py_ssize_t result_ulength,
-                                      Py_UCS4 max_char);
-
-/* RaiseUnexpectedTypeError.proto */
-static int __Pyx_RaiseUnexpectedTypeError(const char *expected, PyObject *obj);
-
 /* GetItemInt.proto */
 #define __Pyx_GetItemInt(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck)\
     (__Pyx_fits_Py_ssize_t(i, type, is_signed) ?\
@@ -2074,6 +2098,28 @@ static CYTHON_INLINE int __Pyx_PyList_Append(PyObject* list, PyObject* x) {
 #define __Pyx_PyList_Append(L,x) PyList_Append(L,x)
 #endif
 
+/* TypeImport.proto */
+#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_12
+#define __PYX_HAVE_RT_ImportType_proto_3_0_12
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+#include <stdalign.h>
+#endif
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L
+#define __PYX_GET_STRUCT_ALIGNMENT_3_0_12(s) alignof(s)
+#else
+#define __PYX_GET_STRUCT_ALIGNMENT_3_0_12(s) sizeof(void*)
+#endif
+enum __Pyx_ImportType_CheckSize_3_0_12 {
+   __Pyx_ImportType_CheckSize_Error_3_0_12 = 0,
+   __Pyx_ImportType_CheckSize_Warn_3_0_12 = 1,
+   __Pyx_ImportType_CheckSize_Ignore_3_0_12 = 2
+};
+static PyTypeObject *__Pyx_ImportType_3_0_12(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_12 check_size);
+#endif
+
+/* GetVTable.proto */
+static void* __Pyx_GetVtable(PyTypeObject *type);
+
 /* Import.proto */
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level);
 
@@ -2300,7 +2346,7 @@ static int __Pyx_check_binary_version(unsigned long ct_version, unsigned long rt
 static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *sig);
 
 /* FunctionImport.proto */
-static int __Pyx_ImportFunction_3_0_11(PyObject *module, const char *funcname, void (**f)(void), const char *sig);
+static int __Pyx_ImportFunction_3_0_12(PyObject *module, const char *funcname, void (**f)(void), const char *sig);
 
 /* InitStrings.proto */
 static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
@@ -2314,9 +2360,7 @@ static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
 /* Module declarations from "libc.stdio" */
 
 /* Module declarations from "pyogrio._err" */
-static int (*__pyx_f_7pyogrio_4_err_exc_wrap_int)(int); /*proto*/
-static int (*__pyx_f_7pyogrio_4_err_exc_wrap_ogrerr)(int); /*proto*/
-static void *(*__pyx_f_7pyogrio_4_err_exc_wrap_pointer)(void *); /*proto*/
+static void *(*__pyx_f_7pyogrio_4_err_check_pointer)(void *); /*proto*/
 
 /* Module declarations from "pyogrio._ogr" */
 static PyObject *__pyx_f_7pyogrio_4_ogr_get_string(char const *, struct __pyx_opt_args_7pyogrio_4_ogr_get_string *__pyx_optional_args); /*proto*/
@@ -2382,6 +2426,7 @@ static const char __pyx_k_name_b[] = "name_b";
 static const char __pyx_k_name_c[] = "name_c";
 static const char __pyx_k_path_c[] = "path_c";
 static const char __pyx_k_prefix[] = "prefix";
+static const char __pyx_k_retval[] = "retval";
 static const char __pyx_k_rstrip[] = "rstrip";
 static const char __pyx_k_abspath[] = "abspath";
 static const char __pyx_k_dirname[] = "dirname";
@@ -2409,6 +2454,7 @@ static const char __pyx_k_extensions[] = "extensions";
 static const char __pyx_k_gpkg_zip_2[] = "gpkg.zip";
 static const char __pyx_k_header_dxf[] = "header.dxf";
 static const char __pyx_k_metadata_c[] = "metadata_c";
+static const char __pyx_k_pyx_vtable[] = "__pyx_vtable__";
 static const char __pyx_k_startswith[] = "startswith";
 static const char __pyx_k_wheel_path[] = "wheel_path";
 static const char __pyx_k_DCAP_CREATE[] = "DCAP_CREATE";
@@ -2452,8 +2498,8 @@ static const char __pyx_k_Could_not_correctly_detect_GDAL[] = "Could not correct
 static const char __pyx_k_Could_not_correctly_detect_PROJ[] = "Could not correctly detect PROJ data files installed by pyogrio wheel";
 static const char __pyx_k_but_it_does_not_appear_to_corre[] = " but it does not appear to correctly contain GDAL data files";
 static const char __pyx_k_check_that_it_was_installed_cor[] = " (check that it was installed correctly into GDAL)";
-static const char __pyx_k_Could_not_detect_GDAL_data_files[] = "Could not detect GDAL data files.  Set GDAL_DATA environment variable to the correct path.";
-static const char __pyx_k_Could_not_detect_PROJ_data_files[] = "Could not detect PROJ data files.  Set PROJ_LIB environment variable to the correct path.";
+static const char __pyx_k_Could_not_detect_GDAL_data_files[] = "Could not detect GDAL data files. Set GDAL_DATA environment variable to the correct path.";
+static const char __pyx_k_Could_not_detect_PROJ_data_files[] = "Could not detect PROJ data files. Set PROJ_LIB environment variable to the correct path.";
 static const char __pyx_k_but_it_does_not_appear_to_corre_2[] = " but it does not appear to correctly contain PROJ data files";
 /* #### Code section: decls ### */
 static PyObject *__pyx_pf_7pyogrio_4_ogr_get_gdal_version(CYTHON_UNUSED PyObject *__pyx_self); /* proto */
@@ -2507,6 +2553,7 @@ typedef struct {
   #endif
   #if CYTHON_USE_MODULE_STATE
   #endif
+  PyTypeObject *__pyx_ptype_7pyogrio_4_err_ErrorHandler;
   #if CYTHON_USE_MODULE_STATE
   #endif
   PyObject *__pyx_n_s_CPLE_BaseError;
@@ -2601,9 +2648,11 @@ typedef struct {
   PyObject *__pyx_n_s_pyogrio__ogr;
   PyObject *__pyx_kp_s_pyogrio__ogr_pyx;
   PyObject *__pyx_n_s_pyogrio_errors;
+  PyObject *__pyx_n_s_pyx_vtable;
   PyObject *__pyx_n_u_r;
   PyObject *__pyx_n_s_range;
   PyObject *__pyx_n_s_register_drivers;
+  PyObject *__pyx_n_s_retval;
   PyObject *__pyx_n_s_revision;
   PyObject *__pyx_n_s_rstrip;
   PyObject *__pyx_n_u_rw;
@@ -2710,6 +2759,7 @@ static int __pyx_m_clear(PyObject *m) {
   #ifdef __Pyx_FusedFunction_USED
   Py_CLEAR(clear_module_state->__pyx_FusedFunctionType);
   #endif
+  Py_CLEAR(clear_module_state->__pyx_ptype_7pyogrio_4_err_ErrorHandler);
   Py_CLEAR(clear_module_state->__pyx_n_s_CPLE_BaseError);
   Py_CLEAR(clear_module_state->__pyx_kp_u_Could_not_correctly_detect_GDAL);
   Py_CLEAR(clear_module_state->__pyx_kp_u_Could_not_correctly_detect_PROJ);
@@ -2802,9 +2852,11 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_pyogrio__ogr);
   Py_CLEAR(clear_module_state->__pyx_kp_s_pyogrio__ogr_pyx);
   Py_CLEAR(clear_module_state->__pyx_n_s_pyogrio_errors);
+  Py_CLEAR(clear_module_state->__pyx_n_s_pyx_vtable);
   Py_CLEAR(clear_module_state->__pyx_n_u_r);
   Py_CLEAR(clear_module_state->__pyx_n_s_range);
   Py_CLEAR(clear_module_state->__pyx_n_s_register_drivers);
+  Py_CLEAR(clear_module_state->__pyx_n_s_retval);
   Py_CLEAR(clear_module_state->__pyx_n_s_revision);
   Py_CLEAR(clear_module_state->__pyx_n_s_rstrip);
   Py_CLEAR(clear_module_state->__pyx_n_u_rw);
@@ -2889,6 +2941,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   #ifdef __Pyx_FusedFunction_USED
   Py_VISIT(traverse_module_state->__pyx_FusedFunctionType);
   #endif
+  Py_VISIT(traverse_module_state->__pyx_ptype_7pyogrio_4_err_ErrorHandler);
   Py_VISIT(traverse_module_state->__pyx_n_s_CPLE_BaseError);
   Py_VISIT(traverse_module_state->__pyx_kp_u_Could_not_correctly_detect_GDAL);
   Py_VISIT(traverse_module_state->__pyx_kp_u_Could_not_correctly_detect_PROJ);
@@ -2981,9 +3034,11 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_pyogrio__ogr);
   Py_VISIT(traverse_module_state->__pyx_kp_s_pyogrio__ogr_pyx);
   Py_VISIT(traverse_module_state->__pyx_n_s_pyogrio_errors);
+  Py_VISIT(traverse_module_state->__pyx_n_s_pyx_vtable);
   Py_VISIT(traverse_module_state->__pyx_n_u_r);
   Py_VISIT(traverse_module_state->__pyx_n_s_range);
   Py_VISIT(traverse_module_state->__pyx_n_s_register_drivers);
+  Py_VISIT(traverse_module_state->__pyx_n_s_retval);
   Py_VISIT(traverse_module_state->__pyx_n_s_revision);
   Py_VISIT(traverse_module_state->__pyx_n_s_rstrip);
   Py_VISIT(traverse_module_state->__pyx_n_u_rw);
@@ -3084,6 +3139,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #endif
 #if CYTHON_USE_MODULE_STATE
 #endif
+#define __pyx_ptype_7pyogrio_4_err_ErrorHandler __pyx_mstate_global->__pyx_ptype_7pyogrio_4_err_ErrorHandler
 #if CYTHON_USE_MODULE_STATE
 #endif
 #define __pyx_n_s_CPLE_BaseError __pyx_mstate_global->__pyx_n_s_CPLE_BaseError
@@ -3178,9 +3234,11 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_pyogrio__ogr __pyx_mstate_global->__pyx_n_s_pyogrio__ogr
 #define __pyx_kp_s_pyogrio__ogr_pyx __pyx_mstate_global->__pyx_kp_s_pyogrio__ogr_pyx
 #define __pyx_n_s_pyogrio_errors __pyx_mstate_global->__pyx_n_s_pyogrio_errors
+#define __pyx_n_s_pyx_vtable __pyx_mstate_global->__pyx_n_s_pyx_vtable
 #define __pyx_n_u_r __pyx_mstate_global->__pyx_n_u_r
 #define __pyx_n_s_range __pyx_mstate_global->__pyx_n_s_range
 #define __pyx_n_s_register_drivers __pyx_mstate_global->__pyx_n_s_register_drivers
+#define __pyx_n_s_retval __pyx_mstate_global->__pyx_n_s_retval
 #define __pyx_n_s_revision __pyx_mstate_global->__pyx_n_s_revision
 #define __pyx_n_s_rstrip __pyx_mstate_global->__pyx_n_s_rstrip
 #define __pyx_n_u_rw __pyx_mstate_global->__pyx_n_u_rw
@@ -3251,7 +3309,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
  * 
  * 
  * cdef get_string(const char *c_str, str encoding="UTF-8"):             # <<<<<<<<<<<<<<
- *     """Get Python string from a char *
+ *     """Get Python string from a char *.
  * 
  */
 
@@ -3326,7 +3384,7 @@ static PyObject *__pyx_f_7pyogrio_4_ogr_get_string(char const *__pyx_v_c_str, st
  * 
  * 
  * cdef get_string(const char *c_str, str encoding="UTF-8"):             # <<<<<<<<<<<<<<
- *     """Get Python string from a char *
+ *     """Get Python string from a char *.
  * 
  */
 
@@ -3703,7 +3761,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_4get_gdal_geos_version(CYTHON_UNUSED Py
  * 
  * def set_gdal_config_options(dict options):             # <<<<<<<<<<<<<<
  *     for name, value in options.items():
- *         name_b = name.encode('utf-8')
+ *         name_b = name.encode("utf-8")
  */
 
 /* Python wrapper */
@@ -3838,7 +3896,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
  * 
  * def set_gdal_config_options(dict options):
  *     for name, value in options.items():             # <<<<<<<<<<<<<<
- *         name_b = name.encode('utf-8')
+ *         name_b = name.encode("utf-8")
  *         name_c = name_b
  */
   __pyx_t_2 = 0;
@@ -3865,7 +3923,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
     /* "pyogrio/_ogr.pyx":64
  * def set_gdal_config_options(dict options):
  *     for name, value in options.items():
- *         name_b = name.encode('utf-8')             # <<<<<<<<<<<<<<
+ *         name_b = name.encode("utf-8")             # <<<<<<<<<<<<<<
  *         name_c = name_b
  * 
  */
@@ -3898,7 +3956,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
 
     /* "pyogrio/_ogr.pyx":65
  *     for name, value in options.items():
- *         name_b = name.encode('utf-8')
+ *         name_b = name.encode("utf-8")
  *         name_c = name_b             # <<<<<<<<<<<<<<
  * 
  *         # None is a special case; this is used to clear the previous value
@@ -3948,7 +4006,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
  * 
  *         # normalize bool to ON/OFF
  *         if isinstance(value, bool):             # <<<<<<<<<<<<<<
- *             value_b = b'ON' if value else b'OFF'
+ *             value_b = b"ON" if value else b"OFF"
  *         else:
  */
     __pyx_t_6 = ((PyObject*)&PyBool_Type);
@@ -3960,9 +4018,9 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
       /* "pyogrio/_ogr.pyx":74
  *         # normalize bool to ON/OFF
  *         if isinstance(value, bool):
- *             value_b = b'ON' if value else b'OFF'             # <<<<<<<<<<<<<<
+ *             value_b = b"ON" if value else b"OFF"             # <<<<<<<<<<<<<<
  *         else:
- *             value_b = str(value).encode('utf-8')
+ *             value_b = str(value).encode("utf-8")
  */
       __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_v_value); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 74, __pyx_L1_error)
       if (__pyx_t_10) {
@@ -3979,16 +4037,16 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
  * 
  *         # normalize bool to ON/OFF
  *         if isinstance(value, bool):             # <<<<<<<<<<<<<<
- *             value_b = b'ON' if value else b'OFF'
+ *             value_b = b"ON" if value else b"OFF"
  *         else:
  */
       goto __pyx_L6;
     }
 
     /* "pyogrio/_ogr.pyx":76
- *             value_b = b'ON' if value else b'OFF'
+ *             value_b = b"ON" if value else b"OFF"
  *         else:
- *             value_b = str(value).encode('utf-8')             # <<<<<<<<<<<<<<
+ *             value_b = str(value).encode("utf-8")             # <<<<<<<<<<<<<<
  * 
  *         value_c = value_b
  */
@@ -4004,7 +4062,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
     __pyx_L6:;
 
     /* "pyogrio/_ogr.pyx":78
- *             value_b = str(value).encode('utf-8')
+ *             value_b = str(value).encode("utf-8")
  * 
  *         value_c = value_b             # <<<<<<<<<<<<<<
  *         CPLSetConfigOption(<const char*>name_c, <const char*>value_c)
@@ -4032,7 +4090,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
  * 
  * def set_gdal_config_options(dict options):             # <<<<<<<<<<<<<<
  *     for name, value in options.items():
- *         name_b = name.encode('utf-8')
+ *         name_b = name.encode("utf-8")
  */
 
   /* function exit code */
@@ -4061,7 +4119,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_6set_gdal_config_options(CYTHON_UNUSED
  * 
  * 
  * def get_gdal_config_option(str name):             # <<<<<<<<<<<<<<
- *     name_b = name.encode('utf-8')
+ *     name_b = name.encode("utf-8")
  *     name_c = name_b
  */
 
@@ -4187,7 +4245,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
   /* "pyogrio/_ogr.pyx":83
  * 
  * def get_gdal_config_option(str name):
- *     name_b = name.encode('utf-8')             # <<<<<<<<<<<<<<
+ *     name_b = name.encode("utf-8")             # <<<<<<<<<<<<<<
  *     name_c = name_b
  *     value = CPLGetConfigOption(<const char*>name_c, NULL)
  */
@@ -4202,7 +4260,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
 
   /* "pyogrio/_ogr.pyx":84
  * def get_gdal_config_option(str name):
- *     name_b = name.encode('utf-8')
+ *     name_b = name.encode("utf-8")
  *     name_c = name_b             # <<<<<<<<<<<<<<
  *     value = CPLGetConfigOption(<const char*>name_c, NULL)
  * 
@@ -4211,7 +4269,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
   __pyx_v_name_c = __pyx_v_name_b;
 
   /* "pyogrio/_ogr.pyx":85
- *     name_b = name.encode('utf-8')
+ *     name_b = name.encode("utf-8")
  *     name_c = name_b
  *     value = CPLGetConfigOption(<const char*>name_c, NULL)             # <<<<<<<<<<<<<<
  * 
@@ -4293,7 +4351,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
  *     if value.isdigit():
  *         return int(value)             # <<<<<<<<<<<<<<
  * 
- *     if value == b'ON':
+ *     if value == b"ON":
  */
     __Pyx_XDECREF(__pyx_r);
     __pyx_t_1 = __Pyx_PyBytes_FromString(__pyx_v_value); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 91, __pyx_L1_error)
@@ -4317,9 +4375,9 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
   /* "pyogrio/_ogr.pyx":93
  *         return int(value)
  * 
- *     if value == b'ON':             # <<<<<<<<<<<<<<
+ *     if value == b"ON":             # <<<<<<<<<<<<<<
  *         return True
- *     if value == b'OFF':
+ *     if value == b"OFF":
  */
   __pyx_t_5 = __Pyx_PyBytes_FromString(__pyx_v_value); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 93, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
@@ -4329,9 +4387,9 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
 
     /* "pyogrio/_ogr.pyx":94
  * 
- *     if value == b'ON':
+ *     if value == b"ON":
  *         return True             # <<<<<<<<<<<<<<
- *     if value == b'OFF':
+ *     if value == b"OFF":
  *         return False
  */
     __Pyx_XDECREF(__pyx_r);
@@ -4342,16 +4400,16 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
     /* "pyogrio/_ogr.pyx":93
  *         return int(value)
  * 
- *     if value == b'ON':             # <<<<<<<<<<<<<<
+ *     if value == b"ON":             # <<<<<<<<<<<<<<
  *         return True
- *     if value == b'OFF':
+ *     if value == b"OFF":
  */
   }
 
   /* "pyogrio/_ogr.pyx":95
- *     if value == b'ON':
+ *     if value == b"ON":
  *         return True
- *     if value == b'OFF':             # <<<<<<<<<<<<<<
+ *     if value == b"OFF":             # <<<<<<<<<<<<<<
  *         return False
  * 
  */
@@ -4363,7 +4421,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
 
     /* "pyogrio/_ogr.pyx":96
  *         return True
- *     if value == b'OFF':
+ *     if value == b"OFF":
  *         return False             # <<<<<<<<<<<<<<
  * 
  *     str_value = get_string(value)
@@ -4374,9 +4432,9 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
     goto __pyx_L0;
 
     /* "pyogrio/_ogr.pyx":95
- *     if value == b'ON':
+ *     if value == b"ON":
  *         return True
- *     if value == b'OFF':             # <<<<<<<<<<<<<<
+ *     if value == b"OFF":             # <<<<<<<<<<<<<<
  *         return False
  * 
  */
@@ -4410,7 +4468,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
  * 
  * 
  * def get_gdal_config_option(str name):             # <<<<<<<<<<<<<<
- *     name_b = name.encode('utf-8')
+ *     name_b = name.encode("utf-8")
  *     name_c = name_b
  */
 
@@ -4435,7 +4493,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_8get_gdal_config_option(CYTHON_UNUSED P
  * 
  * def ogr_driver_supports_write(driver):             # <<<<<<<<<<<<<<
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == "YES":
  */
 
 /* Python wrapper */
@@ -4550,7 +4608,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_10ogr_driver_supports_write(CYTHON_UNUS
   /* "pyogrio/_ogr.pyx":105
  * def ogr_driver_supports_write(driver):
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == 'YES':             # <<<<<<<<<<<<<<
+ *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == "YES":             # <<<<<<<<<<<<<<
  *         return True
  * 
  */
@@ -4584,7 +4642,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_10ogr_driver_supports_write(CYTHON_UNUS
 
     /* "pyogrio/_ogr.pyx":106
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == "YES":
  *         return True             # <<<<<<<<<<<<<<
  * 
  *     return False
@@ -4597,7 +4655,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_10ogr_driver_supports_write(CYTHON_UNUS
     /* "pyogrio/_ogr.pyx":105
  * def ogr_driver_supports_write(driver):
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == 'YES':             # <<<<<<<<<<<<<<
+ *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == "YES":             # <<<<<<<<<<<<<<
  *         return True
  * 
  */
@@ -4620,7 +4678,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_10ogr_driver_supports_write(CYTHON_UNUS
  * 
  * def ogr_driver_supports_write(driver):             # <<<<<<<<<<<<<<
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == "YES":
  */
 
   /* function exit code */
@@ -4641,7 +4699,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_10ogr_driver_supports_write(CYTHON_UNUS
  * 
  * def ogr_driver_supports_vsi(driver):             # <<<<<<<<<<<<<<
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == "YES":
  */
 
 /* Python wrapper */
@@ -4756,7 +4814,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_12ogr_driver_supports_vsi(CYTHON_UNUSED
   /* "pyogrio/_ogr.pyx":113
  * def ogr_driver_supports_vsi(driver):
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == 'YES':             # <<<<<<<<<<<<<<
+ *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == "YES":             # <<<<<<<<<<<<<<
  *         return True
  * 
  */
@@ -4790,7 +4848,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_12ogr_driver_supports_vsi(CYTHON_UNUSED
 
     /* "pyogrio/_ogr.pyx":114
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == "YES":
  *         return True             # <<<<<<<<<<<<<<
  * 
  *     return False
@@ -4803,7 +4861,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_12ogr_driver_supports_vsi(CYTHON_UNUSED
     /* "pyogrio/_ogr.pyx":113
  * def ogr_driver_supports_vsi(driver):
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == 'YES':             # <<<<<<<<<<<<<<
+ *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == "YES":             # <<<<<<<<<<<<<<
  *         return True
  * 
  */
@@ -4826,7 +4884,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_12ogr_driver_supports_vsi(CYTHON_UNUSED
  * 
  * def ogr_driver_supports_vsi(driver):             # <<<<<<<<<<<<<<
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == "YES":
  */
 
   /* function exit code */
@@ -5406,25 +5464,10 @@ static PyObject *__pyx_pw_7pyogrio_4_ogr_21has_proj_data(PyObject *__pyx_self, C
 
 static PyObject *__pyx_pf_7pyogrio_4_ogr_20has_proj_data(CYTHON_UNUSED PyObject *__pyx_self) {
   OGRSpatialReferenceH __pyx_v_srs;
+  OGRErr __pyx_v_retval;
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  PyObject *__pyx_t_2 = NULL;
-  PyObject *__pyx_t_3 = NULL;
-  int __pyx_t_4;
-  int __pyx_t_5;
-  PyObject *__pyx_t_6 = NULL;
-  PyObject *__pyx_t_7 = NULL;
-  PyObject *__pyx_t_8 = NULL;
-  PyObject *__pyx_t_9 = NULL;
-  char const *__pyx_t_10;
-  PyObject *__pyx_t_11 = NULL;
-  PyObject *__pyx_t_12 = NULL;
-  PyObject *__pyx_t_13 = NULL;
-  int __pyx_t_14;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
+  int __pyx_t_1;
   __Pyx_RefNannySetupContext("has_proj_data", 1);
 
   /* "pyogrio/_ogr.pyx":183
@@ -5432,210 +5475,90 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_20has_proj_data(CYTHON_UNUSED PyObject
  *     """
  *     cdef OGRSpatialReferenceH srs = OSRNewSpatialReference(NULL)             # <<<<<<<<<<<<<<
  * 
- *     try:
+ *     retval = OSRImportFromEPSG(srs, 4326)
  */
   __pyx_v_srs = OSRNewSpatialReference(NULL);
 
   /* "pyogrio/_ogr.pyx":185
  *     cdef OGRSpatialReferenceH srs = OSRNewSpatialReference(NULL)
  * 
- *     try:             # <<<<<<<<<<<<<<
- *         exc_wrap_ogrerr(exc_wrap_int(OSRImportFromEPSG(srs, 4326)))
- *     except CPLE_BaseError:
+ *     retval = OSRImportFromEPSG(srs, 4326)             # <<<<<<<<<<<<<<
+ *     if srs != NULL:
+ *         OSRRelease(srs)
  */
-  /*try:*/ {
-    {
-      __Pyx_PyThreadState_declare
-      __Pyx_PyThreadState_assign
-      __Pyx_ExceptionSave(&__pyx_t_1, &__pyx_t_2, &__pyx_t_3);
-      __Pyx_XGOTREF(__pyx_t_1);
-      __Pyx_XGOTREF(__pyx_t_2);
-      __Pyx_XGOTREF(__pyx_t_3);
-      /*try:*/ {
+  __pyx_v_retval = OSRImportFromEPSG(__pyx_v_srs, 0x10E6);
 
-        /* "pyogrio/_ogr.pyx":186
+  /* "pyogrio/_ogr.pyx":186
  * 
- *     try:
- *         exc_wrap_ogrerr(exc_wrap_int(OSRImportFromEPSG(srs, 4326)))             # <<<<<<<<<<<<<<
- *     except CPLE_BaseError:
- *         return False
- */
-        __pyx_t_4 = __pyx_f_7pyogrio_4_err_exc_wrap_int(OSRImportFromEPSG(__pyx_v_srs, 0x10E6)); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 186, __pyx_L6_error)
-        __pyx_t_5 = __pyx_f_7pyogrio_4_err_exc_wrap_ogrerr(__pyx_t_4); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 186, __pyx_L6_error)
-
-        /* "pyogrio/_ogr.pyx":185
- *     cdef OGRSpatialReferenceH srs = OSRNewSpatialReference(NULL)
+ *     retval = OSRImportFromEPSG(srs, 4326)
+ *     if srs != NULL:             # <<<<<<<<<<<<<<
+ *         OSRRelease(srs)
  * 
- *     try:             # <<<<<<<<<<<<<<
- *         exc_wrap_ogrerr(exc_wrap_int(OSRImportFromEPSG(srs, 4326)))
- *     except CPLE_BaseError:
  */
-      }
-
-      /* "pyogrio/_ogr.pyx":190
- *         return False
- *     else:
- *         return True             # <<<<<<<<<<<<<<
- *     finally:
- *         if srs != NULL:
- */
-      /*else:*/ {
-        __Pyx_XDECREF(__pyx_r);
-        __Pyx_INCREF(Py_True);
-        __pyx_r = Py_True;
-        goto __pyx_L9_except_return;
-      }
-      __pyx_L6_error:;
+  __pyx_t_1 = (__pyx_v_srs != NULL);
+  if (__pyx_t_1) {
 
-      /* "pyogrio/_ogr.pyx":187
- *     try:
- *         exc_wrap_ogrerr(exc_wrap_int(OSRImportFromEPSG(srs, 4326)))
- *     except CPLE_BaseError:             # <<<<<<<<<<<<<<
- *         return False
- *     else:
- */
-      __Pyx_ErrFetch(&__pyx_t_6, &__pyx_t_7, &__pyx_t_8);
-      __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 187, __pyx_L8_except_error)
-      __Pyx_GOTREF(__pyx_t_9);
-      __pyx_t_5 = __Pyx_PyErr_GivenExceptionMatches(__pyx_t_6, __pyx_t_9);
-      __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
-      __Pyx_ErrRestore(__pyx_t_6, __pyx_t_7, __pyx_t_8);
-      __pyx_t_6 = 0; __pyx_t_7 = 0; __pyx_t_8 = 0;
-      if (__pyx_t_5) {
-        __Pyx_AddTraceback("pyogrio._ogr.has_proj_data", __pyx_clineno, __pyx_lineno, __pyx_filename);
-        if (__Pyx_GetException(&__pyx_t_8, &__pyx_t_7, &__pyx_t_6) < 0) __PYX_ERR(0, 187, __pyx_L8_except_error)
-        __Pyx_XGOTREF(__pyx_t_8);
-        __Pyx_XGOTREF(__pyx_t_7);
-        __Pyx_XGOTREF(__pyx_t_6);
-
-        /* "pyogrio/_ogr.pyx":188
- *         exc_wrap_ogrerr(exc_wrap_int(OSRImportFromEPSG(srs, 4326)))
- *     except CPLE_BaseError:
- *         return False             # <<<<<<<<<<<<<<
- *     else:
- *         return True
+    /* "pyogrio/_ogr.pyx":187
+ *     retval = OSRImportFromEPSG(srs, 4326)
+ *     if srs != NULL:
+ *         OSRRelease(srs)             # <<<<<<<<<<<<<<
+ * 
+ *     if retval == OGRERR_NONE:
  */
-        __Pyx_XDECREF(__pyx_r);
-        __Pyx_INCREF(Py_False);
-        __pyx_r = Py_False;
-        __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-        __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-        __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-        goto __pyx_L9_except_return;
-      }
-      goto __pyx_L8_except_error;
+    OSRRelease(__pyx_v_srs);
 
-      /* "pyogrio/_ogr.pyx":185
- *     cdef OGRSpatialReferenceH srs = OSRNewSpatialReference(NULL)
+    /* "pyogrio/_ogr.pyx":186
  * 
- *     try:             # <<<<<<<<<<<<<<
- *         exc_wrap_ogrerr(exc_wrap_int(OSRImportFromEPSG(srs, 4326)))
- *     except CPLE_BaseError:
- */
-      __pyx_L8_except_error:;
-      __Pyx_XGIVEREF(__pyx_t_1);
-      __Pyx_XGIVEREF(__pyx_t_2);
-      __Pyx_XGIVEREF(__pyx_t_3);
-      __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3);
-      goto __pyx_L4_error;
-      __pyx_L9_except_return:;
-      __Pyx_XGIVEREF(__pyx_t_1);
-      __Pyx_XGIVEREF(__pyx_t_2);
-      __Pyx_XGIVEREF(__pyx_t_3);
-      __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3);
-      goto __pyx_L3_return;
-    }
-  }
-
-  /* "pyogrio/_ogr.pyx":192
- *         return True
- *     finally:
- *         if srs != NULL:             # <<<<<<<<<<<<<<
- *             OSRRelease(srs)
+ *     retval = OSRImportFromEPSG(srs, 4326)
+ *     if srs != NULL:             # <<<<<<<<<<<<<<
+ *         OSRRelease(srs)
  * 
  */
-  /*finally:*/ {
-    __pyx_L4_error:;
-    /*exception exit:*/{
-      __Pyx_PyThreadState_declare
-      __Pyx_PyThreadState_assign
-      __pyx_t_3 = 0; __pyx_t_2 = 0; __pyx_t_1 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0;
-      __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
-      __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;
-      __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-      __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;
-      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_11, &__pyx_t_12, &__pyx_t_13);
-      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_3, &__pyx_t_2, &__pyx_t_1) < 0)) __Pyx_ErrFetch(&__pyx_t_3, &__pyx_t_2, &__pyx_t_1);
-      __Pyx_XGOTREF(__pyx_t_3);
-      __Pyx_XGOTREF(__pyx_t_2);
-      __Pyx_XGOTREF(__pyx_t_1);
-      __Pyx_XGOTREF(__pyx_t_11);
-      __Pyx_XGOTREF(__pyx_t_12);
-      __Pyx_XGOTREF(__pyx_t_13);
-      __pyx_t_5 = __pyx_lineno; __pyx_t_4 = __pyx_clineno; __pyx_t_10 = __pyx_filename;
-      {
-        __pyx_t_14 = (__pyx_v_srs != NULL);
-        if (__pyx_t_14) {
+  }
 
-          /* "pyogrio/_ogr.pyx":193
- *     finally:
- *         if srs != NULL:
- *             OSRRelease(srs)             # <<<<<<<<<<<<<<
- * 
+  /* "pyogrio/_ogr.pyx":189
+ *         OSRRelease(srs)
  * 
+ *     if retval == OGRERR_NONE:             # <<<<<<<<<<<<<<
+ *         # Succesfull return, so PROJ data files are correctly found
+ *         return True
  */
-          OSRRelease(__pyx_v_srs);
+  __pyx_t_1 = (__pyx_v_retval == OGRERR_NONE);
+  if (__pyx_t_1) {
 
-          /* "pyogrio/_ogr.pyx":192
- *         return True
- *     finally:
- *         if srs != NULL:             # <<<<<<<<<<<<<<
- *             OSRRelease(srs)
- * 
+    /* "pyogrio/_ogr.pyx":191
+ *     if retval == OGRERR_NONE:
+ *         # Succesfull return, so PROJ data files are correctly found
+ *         return True             # <<<<<<<<<<<<<<
+ *     else:
+ *         return False
  */
-        }
-      }
-      if (PY_MAJOR_VERSION >= 3) {
-        __Pyx_XGIVEREF(__pyx_t_11);
-        __Pyx_XGIVEREF(__pyx_t_12);
-        __Pyx_XGIVEREF(__pyx_t_13);
-        __Pyx_ExceptionReset(__pyx_t_11, __pyx_t_12, __pyx_t_13);
-      }
-      __Pyx_XGIVEREF(__pyx_t_3);
-      __Pyx_XGIVEREF(__pyx_t_2);
-      __Pyx_XGIVEREF(__pyx_t_1);
-      __Pyx_ErrRestore(__pyx_t_3, __pyx_t_2, __pyx_t_1);
-      __pyx_t_3 = 0; __pyx_t_2 = 0; __pyx_t_1 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0;
-      __pyx_lineno = __pyx_t_5; __pyx_clineno = __pyx_t_4; __pyx_filename = __pyx_t_10;
-      goto __pyx_L1_error;
-    }
-    __pyx_L3_return: {
-      __pyx_t_13 = __pyx_r;
-      __pyx_r = 0;
-      __pyx_t_14 = (__pyx_v_srs != NULL);
-      if (__pyx_t_14) {
+    __Pyx_XDECREF(__pyx_r);
+    __Pyx_INCREF(Py_True);
+    __pyx_r = Py_True;
+    goto __pyx_L0;
 
-        /* "pyogrio/_ogr.pyx":193
- *     finally:
- *         if srs != NULL:
- *             OSRRelease(srs)             # <<<<<<<<<<<<<<
- * 
+    /* "pyogrio/_ogr.pyx":189
+ *         OSRRelease(srs)
  * 
+ *     if retval == OGRERR_NONE:             # <<<<<<<<<<<<<<
+ *         # Succesfull return, so PROJ data files are correctly found
+ *         return True
  */
-        OSRRelease(__pyx_v_srs);
+  }
 
-        /* "pyogrio/_ogr.pyx":192
+  /* "pyogrio/_ogr.pyx":193
  *         return True
- *     finally:
- *         if srs != NULL:             # <<<<<<<<<<<<<<
- *             OSRRelease(srs)
+ *     else:
+ *         return False             # <<<<<<<<<<<<<<
+ * 
  * 
  */
-      }
-      __pyx_r = __pyx_t_13;
-      __pyx_t_13 = 0;
-      goto __pyx_L0;
-    }
+  /*else*/ {
+    __Pyx_XDECREF(__pyx_r);
+    __Pyx_INCREF(Py_False);
+    __pyx_r = Py_False;
+    goto __pyx_L0;
   }
 
   /* "pyogrio/_ogr.pyx":172
@@ -5647,13 +5570,6 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_20has_proj_data(CYTHON_UNUSED PyObject
  */
 
   /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_6);
-  __Pyx_XDECREF(__pyx_t_7);
-  __Pyx_XDECREF(__pyx_t_8);
-  __Pyx_XDECREF(__pyx_t_9);
-  __Pyx_AddTraceback("pyogrio._ogr.has_proj_data", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
@@ -5664,13 +5580,13 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_20has_proj_data(CYTHON_UNUSED PyObject
  * 
  * 
  * def init_gdal_data():             # <<<<<<<<<<<<<<
- *     """Set GDAL data search directories in the following precedence:
- *     - wheel copy of gdal_data
+ *     """Set GDAL data search directories.
+ * 
  */
 
 /* Python wrapper */
 static PyObject *__pyx_pw_7pyogrio_4_ogr_23init_gdal_data(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7pyogrio_4_ogr_22init_gdal_data, "Set GDAL data search directories in the following precedence:\n    - wheel copy of gdal_data\n    - default detection by GDAL, including GDAL_DATA (detected automatically by GDAL)\n    - other well-known paths under sys.prefix\n\n    Adapted from Fiona (env.py, _env.pyx).\n    ");
+PyDoc_STRVAR(__pyx_doc_7pyogrio_4_ogr_22init_gdal_data, "Set GDAL data search directories.\n\n    They are set in the following precedence:\n    - wheel copy of gdal_data\n    - default detection by GDAL, including GDAL_DATA (detected automatically by GDAL)\n    - other well-known paths under sys.prefix\n\n    Adapted from Fiona (env.py, _env.pyx).\n    ");
 static PyMethodDef __pyx_mdef_7pyogrio_4_ogr_23init_gdal_data = {"init_gdal_data", (PyCFunction)__pyx_pw_7pyogrio_4_ogr_23init_gdal_data, METH_NOARGS, __pyx_doc_7pyogrio_4_ogr_22init_gdal_data};
 static PyObject *__pyx_pw_7pyogrio_4_ogr_23init_gdal_data(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused) {
   CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
@@ -5708,38 +5624,38 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("init_gdal_data", 1);
 
-  /* "pyogrio/_ogr.pyx":206
+  /* "pyogrio/_ogr.pyx":208
  * 
  *     # wheels are packaged to include GDAL data files at pyogrio/gdal_data
  *     wheel_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "gdal_data"))             # <<<<<<<<<<<<<<
  *     if os.path.exists(wheel_path):
  *         set_gdal_config_options({"GDAL_DATA": wheel_path})
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_abspath); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_abspath); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_os); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_os); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_path); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_path); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_join); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_join); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_os); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_os); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_path); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_path); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_dirname); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_dirname); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_file); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_file); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 208, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __pyx_t_8 = NULL;
   __pyx_t_9 = 0;
@@ -5760,7 +5676,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
     __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-    if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 206, __pyx_L1_error)
+    if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 208, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   }
@@ -5783,7 +5699,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
     __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_9, 2+__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, 206, __pyx_L1_error)
+    if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 208, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
@@ -5806,26 +5722,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 206, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 208, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __pyx_v_wheel_path = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "pyogrio/_ogr.pyx":207
+  /* "pyogrio/_ogr.pyx":209
  *     # wheels are packaged to include GDAL data files at pyogrio/gdal_data
  *     wheel_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "gdal_data"))
  *     if os.path.exists(wheel_path):             # <<<<<<<<<<<<<<
  *         set_gdal_config_options({"GDAL_DATA": wheel_path})
  *         if not has_gdal_data():
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 207, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 209, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 207, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 209, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_exists); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 207, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_exists); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 209, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -5846,26 +5762,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
     PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_wheel_path};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 207, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 209, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
-  __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 207, __pyx_L1_error)
+  __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 209, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_10) {
 
-    /* "pyogrio/_ogr.pyx":208
+    /* "pyogrio/_ogr.pyx":210
  *     wheel_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "gdal_data"))
  *     if os.path.exists(wheel_path):
  *         set_gdal_config_options({"GDAL_DATA": wheel_path})             # <<<<<<<<<<<<<<
  *         if not has_gdal_data():
- *             raise ValueError("Could not correctly detect GDAL data files installed by pyogrio wheel")
+ *             raise ValueError(
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_set_gdal_config_options); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 208, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_set_gdal_config_options); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 210, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 208, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 210, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    if (PyDict_SetItem(__pyx_t_3, __pyx_n_u_GDAL_DATA, __pyx_v_wheel_path) < 0) __PYX_ERR(0, 208, __pyx_L1_error)
+    if (PyDict_SetItem(__pyx_t_3, __pyx_n_u_GDAL_DATA, __pyx_v_wheel_path) < 0) __PYX_ERR(0, 210, __pyx_L1_error)
     __pyx_t_4 = NULL;
     __pyx_t_9 = 0;
     #if CYTHON_UNPACK_METHODS
@@ -5885,20 +5801,20 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
       __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
       __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 208, __pyx_L1_error)
+      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 210, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "pyogrio/_ogr.pyx":209
+    /* "pyogrio/_ogr.pyx":211
  *     if os.path.exists(wheel_path):
  *         set_gdal_config_options({"GDAL_DATA": wheel_path})
  *         if not has_gdal_data():             # <<<<<<<<<<<<<<
- *             raise ValueError("Could not correctly detect GDAL data files installed by pyogrio wheel")
- *         return
+ *             raise ValueError(
+ *                 "Could not correctly detect GDAL data files installed by pyogrio wheel"
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_gdal_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 209, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_gdal_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 211, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_3 = NULL;
     __pyx_t_9 = 0;
@@ -5918,40 +5834,40 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
       PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL};
       __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 0+__pyx_t_9);
       __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 209, __pyx_L1_error)
+      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 211, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 209, __pyx_L1_error)
+    __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 211, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_11 = (!__pyx_t_10);
     if (unlikely(__pyx_t_11)) {
 
-      /* "pyogrio/_ogr.pyx":210
+      /* "pyogrio/_ogr.pyx":212
  *         set_gdal_config_options({"GDAL_DATA": wheel_path})
  *         if not has_gdal_data():
- *             raise ValueError("Could not correctly detect GDAL data files installed by pyogrio wheel")             # <<<<<<<<<<<<<<
- *         return
- * 
+ *             raise ValueError(             # <<<<<<<<<<<<<<
+ *                 "Could not correctly detect GDAL data files installed by pyogrio wheel"
+ *             )
  */
-      __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 210, __pyx_L1_error)
+      __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 212, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_Raise(__pyx_t_1, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-      __PYX_ERR(0, 210, __pyx_L1_error)
+      __PYX_ERR(0, 212, __pyx_L1_error)
 
-      /* "pyogrio/_ogr.pyx":209
+      /* "pyogrio/_ogr.pyx":211
  *     if os.path.exists(wheel_path):
  *         set_gdal_config_options({"GDAL_DATA": wheel_path})
  *         if not has_gdal_data():             # <<<<<<<<<<<<<<
- *             raise ValueError("Could not correctly detect GDAL data files installed by pyogrio wheel")
- *         return
+ *             raise ValueError(
+ *                 "Could not correctly detect GDAL data files installed by pyogrio wheel"
  */
     }
 
-    /* "pyogrio/_ogr.pyx":211
- *         if not has_gdal_data():
- *             raise ValueError("Could not correctly detect GDAL data files installed by pyogrio wheel")
+    /* "pyogrio/_ogr.pyx":215
+ *                 "Could not correctly detect GDAL data files installed by pyogrio wheel"
+ *             )
  *         return             # <<<<<<<<<<<<<<
  * 
  *     # GDAL correctly found data files from GDAL_DATA or compiled-in paths
@@ -5960,7 +5876,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "pyogrio/_ogr.pyx":207
+    /* "pyogrio/_ogr.pyx":209
  *     # wheels are packaged to include GDAL data files at pyogrio/gdal_data
  *     wheel_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "gdal_data"))
  *     if os.path.exists(wheel_path):             # <<<<<<<<<<<<<<
@@ -5969,14 +5885,14 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
  */
   }
 
-  /* "pyogrio/_ogr.pyx":214
+  /* "pyogrio/_ogr.pyx":218
  * 
  *     # GDAL correctly found data files from GDAL_DATA or compiled-in paths
  *     if has_gdal_data():             # <<<<<<<<<<<<<<
  *         return
  * 
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_gdal_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 214, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_gdal_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 218, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = NULL;
   __pyx_t_9 = 0;
@@ -5996,26 +5912,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
     PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 0+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 214, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 218, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
-  __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 214, __pyx_L1_error)
+  __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 218, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_11) {
 
-    /* "pyogrio/_ogr.pyx":215
+    /* "pyogrio/_ogr.pyx":219
  *     # GDAL correctly found data files from GDAL_DATA or compiled-in paths
  *     if has_gdal_data():
  *         return             # <<<<<<<<<<<<<<
  * 
- *     wk_path = os.path.join(sys.prefix, 'share', 'gdal')
+ *     wk_path = os.path.join(sys.prefix, "share", "gdal")
  */
     __Pyx_XDECREF(__pyx_r);
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "pyogrio/_ogr.pyx":214
+    /* "pyogrio/_ogr.pyx":218
  * 
  *     # GDAL correctly found data files from GDAL_DATA or compiled-in paths
  *     if has_gdal_data():             # <<<<<<<<<<<<<<
@@ -6024,24 +5940,24 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
  */
   }
 
-  /* "pyogrio/_ogr.pyx":217
+  /* "pyogrio/_ogr.pyx":221
  *         return
  * 
- *     wk_path = os.path.join(sys.prefix, 'share', 'gdal')             # <<<<<<<<<<<<<<
+ *     wk_path = os.path.join(sys.prefix, "share", "gdal")             # <<<<<<<<<<<<<<
  *     if os.path.exists(wk_path):
  *         set_gdal_config_options({"GDAL_DATA": wk_path})
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 217, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 221, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 217, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 221, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_join); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 217, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_join); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 221, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_sys); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 217, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_sys); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 221, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_prefix); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 217, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_prefix); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 221, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -6063,26 +5979,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 217, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 221, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __pyx_v_wk_path = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "pyogrio/_ogr.pyx":218
+  /* "pyogrio/_ogr.pyx":222
  * 
- *     wk_path = os.path.join(sys.prefix, 'share', 'gdal')
+ *     wk_path = os.path.join(sys.prefix, "share", "gdal")
  *     if os.path.exists(wk_path):             # <<<<<<<<<<<<<<
  *         set_gdal_config_options({"GDAL_DATA": wk_path})
  *         if not has_gdal_data():
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 218, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 222, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 218, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 222, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_exists); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 218, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_exists); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 222, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __pyx_t_4 = NULL;
@@ -6103,26 +6019,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
     PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_wk_path};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 218, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 222, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
-  __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 218, __pyx_L1_error)
+  __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 222, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_11) {
 
-    /* "pyogrio/_ogr.pyx":219
- *     wk_path = os.path.join(sys.prefix, 'share', 'gdal')
+    /* "pyogrio/_ogr.pyx":223
+ *     wk_path = os.path.join(sys.prefix, "share", "gdal")
  *     if os.path.exists(wk_path):
  *         set_gdal_config_options({"GDAL_DATA": wk_path})             # <<<<<<<<<<<<<<
  *         if not has_gdal_data():
- *             raise ValueError(f"Found GDAL data directory at {wk_path} but it does not appear to correctly contain GDAL data files")
+ *             raise ValueError(
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_set_gdal_config_options); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 219, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_set_gdal_config_options); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 223, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 219, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 223, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    if (PyDict_SetItem(__pyx_t_4, __pyx_n_u_GDAL_DATA, __pyx_v_wk_path) < 0) __PYX_ERR(0, 219, __pyx_L1_error)
+    if (PyDict_SetItem(__pyx_t_4, __pyx_n_u_GDAL_DATA, __pyx_v_wk_path) < 0) __PYX_ERR(0, 223, __pyx_L1_error)
     __pyx_t_3 = NULL;
     __pyx_t_9 = 0;
     #if CYTHON_UNPACK_METHODS
@@ -6142,20 +6058,20 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
       __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
       __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 219, __pyx_L1_error)
+      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 223, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "pyogrio/_ogr.pyx":220
+    /* "pyogrio/_ogr.pyx":224
  *     if os.path.exists(wk_path):
  *         set_gdal_config_options({"GDAL_DATA": wk_path})
  *         if not has_gdal_data():             # <<<<<<<<<<<<<<
- *             raise ValueError(f"Found GDAL data directory at {wk_path} but it does not appear to correctly contain GDAL data files")
- *         return
+ *             raise ValueError(
+ *                 f"Found GDAL data directory at {wk_path} but it does not appear to "
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_gdal_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 220, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_gdal_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 224, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_4 = NULL;
     __pyx_t_9 = 0;
@@ -6175,23 +6091,23 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
       PyObject *__pyx_callargs[2] = {__pyx_t_4, NULL};
       __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 0+__pyx_t_9);
       __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 220, __pyx_L1_error)
+      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 224, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 220, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 224, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_10 = (!__pyx_t_11);
     if (unlikely(__pyx_t_10)) {
 
-      /* "pyogrio/_ogr.pyx":221
- *         set_gdal_config_options({"GDAL_DATA": wk_path})
+      /* "pyogrio/_ogr.pyx":226
  *         if not has_gdal_data():
- *             raise ValueError(f"Found GDAL data directory at {wk_path} but it does not appear to correctly contain GDAL data files")             # <<<<<<<<<<<<<<
- *         return
- * 
+ *             raise ValueError(
+ *                 f"Found GDAL data directory at {wk_path} but it does not appear to "             # <<<<<<<<<<<<<<
+ *                 "correctly contain GDAL data files"
+ *             )
  */
-      __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 221, __pyx_L1_error)
+      __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 226, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __pyx_t_12 = 0;
       __pyx_t_13 = 127;
@@ -6199,7 +6115,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
       __pyx_t_12 += 29;
       __Pyx_GIVEREF(__pyx_kp_u_Found_GDAL_data_directory_at);
       PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_kp_u_Found_GDAL_data_directory_at);
-      __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_v_wk_path, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 221, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_v_wk_path, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 226, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __pyx_t_13 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) > __pyx_t_13) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) : __pyx_t_13;
       __pyx_t_12 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_2);
@@ -6210,58 +6126,74 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
       __pyx_t_12 += 60;
       __Pyx_GIVEREF(__pyx_kp_u_but_it_does_not_appear_to_corre);
       PyTuple_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_but_it_does_not_appear_to_corre);
-      __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_1, 3, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 221, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_1, 3, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 226, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-      __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 221, __pyx_L1_error)
+
+      /* "pyogrio/_ogr.pyx":225
+ *         set_gdal_config_options({"GDAL_DATA": wk_path})
+ *         if not has_gdal_data():
+ *             raise ValueError(             # <<<<<<<<<<<<<<
+ *                 f"Found GDAL data directory at {wk_path} but it does not appear to "
+ *                 "correctly contain GDAL data files"
+ */
+      __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 225, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_Raise(__pyx_t_1, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-      __PYX_ERR(0, 221, __pyx_L1_error)
+      __PYX_ERR(0, 225, __pyx_L1_error)
 
-      /* "pyogrio/_ogr.pyx":220
+      /* "pyogrio/_ogr.pyx":224
  *     if os.path.exists(wk_path):
  *         set_gdal_config_options({"GDAL_DATA": wk_path})
  *         if not has_gdal_data():             # <<<<<<<<<<<<<<
- *             raise ValueError(f"Found GDAL data directory at {wk_path} but it does not appear to correctly contain GDAL data files")
- *         return
+ *             raise ValueError(
+ *                 f"Found GDAL data directory at {wk_path} but it does not appear to "
  */
     }
 
-    /* "pyogrio/_ogr.pyx":222
- *         if not has_gdal_data():
- *             raise ValueError(f"Found GDAL data directory at {wk_path} but it does not appear to correctly contain GDAL data files")
+    /* "pyogrio/_ogr.pyx":229
+ *                 "correctly contain GDAL data files"
+ *             )
  *         return             # <<<<<<<<<<<<<<
  * 
- *     warnings.warn("Could not detect GDAL data files.  Set GDAL_DATA environment variable to the correct path.", RuntimeWarning)
+ *     warnings.warn(
  */
     __Pyx_XDECREF(__pyx_r);
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "pyogrio/_ogr.pyx":218
+    /* "pyogrio/_ogr.pyx":222
  * 
- *     wk_path = os.path.join(sys.prefix, 'share', 'gdal')
+ *     wk_path = os.path.join(sys.prefix, "share", "gdal")
  *     if os.path.exists(wk_path):             # <<<<<<<<<<<<<<
  *         set_gdal_config_options({"GDAL_DATA": wk_path})
  *         if not has_gdal_data():
  */
   }
 
-  /* "pyogrio/_ogr.pyx":224
+  /* "pyogrio/_ogr.pyx":231
  *         return
  * 
- *     warnings.warn("Could not detect GDAL data files.  Set GDAL_DATA environment variable to the correct path.", RuntimeWarning)             # <<<<<<<<<<<<<<
- * 
- * 
+ *     warnings.warn(             # <<<<<<<<<<<<<<
+ *         "Could not detect GDAL data files. Set GDAL_DATA environment variable to the "
+ *         "correct path.",
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_warnings); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 224, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_warnings); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 231, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_warn); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 224, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_warn); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 231, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 224, __pyx_L1_error)
+
+  /* "pyogrio/_ogr.pyx":234
+ *         "Could not detect GDAL data files. Set GDAL_DATA environment variable to the "
+ *         "correct path.",
+ *         RuntimeWarning             # <<<<<<<<<<<<<<
+ *     )
+ * 
+ */
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 231, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -6270,8 +6202,8 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
  * 
  * 
  * def init_gdal_data():             # <<<<<<<<<<<<<<
- *     """Set GDAL data search directories in the following precedence:
- *     - wheel copy of gdal_data
+ *     """Set GDAL data search directories.
+ * 
  */
 
   /* function exit code */
@@ -6296,7 +6228,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_22init_gdal_data(CYTHON_UNUSED PyObject
   return __pyx_r;
 }
 
-/* "pyogrio/_ogr.pyx":227
+/* "pyogrio/_ogr.pyx":238
  * 
  * 
  * def init_proj_data():             # <<<<<<<<<<<<<<
@@ -6344,38 +6276,38 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("init_proj_data", 1);
 
-  /* "pyogrio/_ogr.pyx":237
+  /* "pyogrio/_ogr.pyx":248
  * 
  *     # wheels are packaged to include PROJ data files at pyogrio/proj_data
  *     wheel_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "proj_data"))             # <<<<<<<<<<<<<<
  *     if os.path.exists(wheel_path):
  *         set_proj_search_path(wheel_path)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_abspath); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_abspath); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_os); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_os); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_path); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_path); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_join); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_join); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_os); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_os); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_path); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_path); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_dirname); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_dirname); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_file); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 237, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_file); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 248, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __pyx_t_8 = NULL;
   __pyx_t_9 = 0;
@@ -6396,7 +6328,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
     __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-    if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 237, __pyx_L1_error)
+    if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 248, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   }
@@ -6419,7 +6351,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
     __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_9, 2+__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, 237, __pyx_L1_error)
+    if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 248, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
@@ -6442,26 +6374,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 237, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 248, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __pyx_v_wheel_path = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "pyogrio/_ogr.pyx":238
+  /* "pyogrio/_ogr.pyx":249
  *     # wheels are packaged to include PROJ data files at pyogrio/proj_data
  *     wheel_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "proj_data"))
  *     if os.path.exists(wheel_path):             # <<<<<<<<<<<<<<
  *         set_proj_search_path(wheel_path)
  *         # verify that this now resolves
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 238, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 238, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_exists); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 238, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_exists); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -6482,32 +6414,32 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
     PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_wheel_path};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 238, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
-  __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 238, __pyx_L1_error)
+  __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 249, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_10) {
 
-    /* "pyogrio/_ogr.pyx":239
+    /* "pyogrio/_ogr.pyx":250
  *     wheel_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "proj_data"))
  *     if os.path.exists(wheel_path):
  *         set_proj_search_path(wheel_path)             # <<<<<<<<<<<<<<
  *         # verify that this now resolves
  *         if not has_proj_data():
  */
-    if (!(likely(PyUnicode_CheckExact(__pyx_v_wheel_path))||((__pyx_v_wheel_path) == Py_None) || __Pyx_RaiseUnexpectedTypeError("unicode", __pyx_v_wheel_path))) __PYX_ERR(0, 239, __pyx_L1_error)
-    __pyx_f_7pyogrio_4_ogr_set_proj_search_path(((PyObject*)__pyx_v_wheel_path)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 239, __pyx_L1_error)
+    if (!(likely(PyUnicode_CheckExact(__pyx_v_wheel_path))||((__pyx_v_wheel_path) == Py_None) || __Pyx_RaiseUnexpectedTypeError("unicode", __pyx_v_wheel_path))) __PYX_ERR(0, 250, __pyx_L1_error)
+    __pyx_f_7pyogrio_4_ogr_set_proj_search_path(((PyObject*)__pyx_v_wheel_path)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 250, __pyx_L1_error)
 
-    /* "pyogrio/_ogr.pyx":241
+    /* "pyogrio/_ogr.pyx":252
  *         set_proj_search_path(wheel_path)
  *         # verify that this now resolves
  *         if not has_proj_data():             # <<<<<<<<<<<<<<
- *             raise ValueError("Could not correctly detect PROJ data files installed by pyogrio wheel")
- *         return
+ *             raise ValueError(
+ *                 "Could not correctly detect PROJ data files installed by pyogrio wheel"
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_proj_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 241, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_proj_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_3 = NULL;
     __pyx_t_9 = 0;
@@ -6527,40 +6459,40 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
       PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL};
       __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 0+__pyx_t_9);
       __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 241, __pyx_L1_error)
+      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 252, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 241, __pyx_L1_error)
+    __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 252, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_11 = (!__pyx_t_10);
     if (unlikely(__pyx_t_11)) {
 
-      /* "pyogrio/_ogr.pyx":242
+      /* "pyogrio/_ogr.pyx":253
  *         # verify that this now resolves
  *         if not has_proj_data():
- *             raise ValueError("Could not correctly detect PROJ data files installed by pyogrio wheel")             # <<<<<<<<<<<<<<
- *         return
- * 
+ *             raise ValueError(             # <<<<<<<<<<<<<<
+ *                 "Could not correctly detect PROJ data files installed by pyogrio wheel"
+ *             )
  */
-      __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 242, __pyx_L1_error)
+      __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 253, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_Raise(__pyx_t_1, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-      __PYX_ERR(0, 242, __pyx_L1_error)
+      __PYX_ERR(0, 253, __pyx_L1_error)
 
-      /* "pyogrio/_ogr.pyx":241
+      /* "pyogrio/_ogr.pyx":252
  *         set_proj_search_path(wheel_path)
  *         # verify that this now resolves
  *         if not has_proj_data():             # <<<<<<<<<<<<<<
- *             raise ValueError("Could not correctly detect PROJ data files installed by pyogrio wheel")
- *         return
+ *             raise ValueError(
+ *                 "Could not correctly detect PROJ data files installed by pyogrio wheel"
  */
     }
 
-    /* "pyogrio/_ogr.pyx":243
- *         if not has_proj_data():
- *             raise ValueError("Could not correctly detect PROJ data files installed by pyogrio wheel")
+    /* "pyogrio/_ogr.pyx":256
+ *                 "Could not correctly detect PROJ data files installed by pyogrio wheel"
+ *             )
  *         return             # <<<<<<<<<<<<<<
  * 
  *     # PROJ correctly found data files from PROJ_LIB or compiled-in paths
@@ -6569,7 +6501,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "pyogrio/_ogr.pyx":238
+    /* "pyogrio/_ogr.pyx":249
  *     # wheels are packaged to include PROJ data files at pyogrio/proj_data
  *     wheel_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "proj_data"))
  *     if os.path.exists(wheel_path):             # <<<<<<<<<<<<<<
@@ -6578,14 +6510,14 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
  */
   }
 
-  /* "pyogrio/_ogr.pyx":246
+  /* "pyogrio/_ogr.pyx":259
  * 
  *     # PROJ correctly found data files from PROJ_LIB or compiled-in paths
  *     if has_proj_data():             # <<<<<<<<<<<<<<
  *         return
  * 
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_proj_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 246, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_proj_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 259, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = NULL;
   __pyx_t_9 = 0;
@@ -6605,26 +6537,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
     PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 0+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 246, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 259, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
-  __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 246, __pyx_L1_error)
+  __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 259, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_11) {
 
-    /* "pyogrio/_ogr.pyx":247
+    /* "pyogrio/_ogr.pyx":260
  *     # PROJ correctly found data files from PROJ_LIB or compiled-in paths
  *     if has_proj_data():
  *         return             # <<<<<<<<<<<<<<
  * 
- *     wk_path = os.path.join(sys.prefix, 'share', 'proj')
+ *     wk_path = os.path.join(sys.prefix, "share", "proj")
  */
     __Pyx_XDECREF(__pyx_r);
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "pyogrio/_ogr.pyx":246
+    /* "pyogrio/_ogr.pyx":259
  * 
  *     # PROJ correctly found data files from PROJ_LIB or compiled-in paths
  *     if has_proj_data():             # <<<<<<<<<<<<<<
@@ -6633,24 +6565,24 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
  */
   }
 
-  /* "pyogrio/_ogr.pyx":249
+  /* "pyogrio/_ogr.pyx":262
  *         return
  * 
- *     wk_path = os.path.join(sys.prefix, 'share', 'proj')             # <<<<<<<<<<<<<<
+ *     wk_path = os.path.join(sys.prefix, "share", "proj")             # <<<<<<<<<<<<<<
  *     if os.path.exists(wk_path):
  *         set_proj_search_path(wk_path)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 262, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 262, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_join); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_join); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 262, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_sys); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_sys); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 262, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_prefix); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_prefix); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 262, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -6672,26 +6604,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 262, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __pyx_v_wk_path = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "pyogrio/_ogr.pyx":250
+  /* "pyogrio/_ogr.pyx":263
  * 
- *     wk_path = os.path.join(sys.prefix, 'share', 'proj')
+ *     wk_path = os.path.join(sys.prefix, "share", "proj")
  *     if os.path.exists(wk_path):             # <<<<<<<<<<<<<<
  *         set_proj_search_path(wk_path)
  *         # verify that this now resolves
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_os); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 263, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_path); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 263, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_exists); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_exists); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 263, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __pyx_t_4 = NULL;
@@ -6712,32 +6644,32 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
     PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_wk_path};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 250, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 263, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
-  __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 263, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_11) {
 
-    /* "pyogrio/_ogr.pyx":251
- *     wk_path = os.path.join(sys.prefix, 'share', 'proj')
+    /* "pyogrio/_ogr.pyx":264
+ *     wk_path = os.path.join(sys.prefix, "share", "proj")
  *     if os.path.exists(wk_path):
  *         set_proj_search_path(wk_path)             # <<<<<<<<<<<<<<
  *         # verify that this now resolves
  *         if not has_proj_data():
  */
-    if (!(likely(PyUnicode_CheckExact(__pyx_v_wk_path))||((__pyx_v_wk_path) == Py_None) || __Pyx_RaiseUnexpectedTypeError("unicode", __pyx_v_wk_path))) __PYX_ERR(0, 251, __pyx_L1_error)
-    __pyx_f_7pyogrio_4_ogr_set_proj_search_path(((PyObject*)__pyx_v_wk_path)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 251, __pyx_L1_error)
+    if (!(likely(PyUnicode_CheckExact(__pyx_v_wk_path))||((__pyx_v_wk_path) == Py_None) || __Pyx_RaiseUnexpectedTypeError("unicode", __pyx_v_wk_path))) __PYX_ERR(0, 264, __pyx_L1_error)
+    __pyx_f_7pyogrio_4_ogr_set_proj_search_path(((PyObject*)__pyx_v_wk_path)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 264, __pyx_L1_error)
 
-    /* "pyogrio/_ogr.pyx":253
+    /* "pyogrio/_ogr.pyx":266
  *         set_proj_search_path(wk_path)
  *         # verify that this now resolves
  *         if not has_proj_data():             # <<<<<<<<<<<<<<
- *             raise ValueError(f"Found PROJ data directory at {wk_path} but it does not appear to correctly contain PROJ data files")
- *         return
+ *             raise ValueError(
+ *                 f"Found PROJ data directory at {wk_path} but it does not appear to "
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_proj_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 253, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_has_proj_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 266, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_4 = NULL;
     __pyx_t_9 = 0;
@@ -6757,23 +6689,23 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
       PyObject *__pyx_callargs[2] = {__pyx_t_4, NULL};
       __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 0+__pyx_t_9);
       __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 253, __pyx_L1_error)
+      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 266, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 253, __pyx_L1_error)
+    __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 266, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_10 = (!__pyx_t_11);
     if (unlikely(__pyx_t_10)) {
 
-      /* "pyogrio/_ogr.pyx":254
- *         # verify that this now resolves
+      /* "pyogrio/_ogr.pyx":268
  *         if not has_proj_data():
- *             raise ValueError(f"Found PROJ data directory at {wk_path} but it does not appear to correctly contain PROJ data files")             # <<<<<<<<<<<<<<
- *         return
- * 
+ *             raise ValueError(
+ *                 f"Found PROJ data directory at {wk_path} but it does not appear to "             # <<<<<<<<<<<<<<
+ *                 "correctly contain PROJ data files"
+ *             )
  */
-      __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 254, __pyx_L1_error)
+      __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 268, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __pyx_t_12 = 0;
       __pyx_t_13 = 127;
@@ -6781,7 +6713,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
       __pyx_t_12 += 29;
       __Pyx_GIVEREF(__pyx_kp_u_Found_PROJ_data_directory_at);
       PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_kp_u_Found_PROJ_data_directory_at);
-      __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_v_wk_path, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 254, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyObject_FormatSimple(__pyx_v_wk_path, __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 268, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __pyx_t_13 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) > __pyx_t_13) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) : __pyx_t_13;
       __pyx_t_12 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_2);
@@ -6792,63 +6724,79 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
       __pyx_t_12 += 60;
       __Pyx_GIVEREF(__pyx_kp_u_but_it_does_not_appear_to_corre_2);
       PyTuple_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_but_it_does_not_appear_to_corre_2);
-      __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_1, 3, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 254, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_1, 3, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 268, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-      __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 254, __pyx_L1_error)
+
+      /* "pyogrio/_ogr.pyx":267
+ *         # verify that this now resolves
+ *         if not has_proj_data():
+ *             raise ValueError(             # <<<<<<<<<<<<<<
+ *                 f"Found PROJ data directory at {wk_path} but it does not appear to "
+ *                 "correctly contain PROJ data files"
+ */
+      __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 267, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_Raise(__pyx_t_1, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-      __PYX_ERR(0, 254, __pyx_L1_error)
+      __PYX_ERR(0, 267, __pyx_L1_error)
 
-      /* "pyogrio/_ogr.pyx":253
+      /* "pyogrio/_ogr.pyx":266
  *         set_proj_search_path(wk_path)
  *         # verify that this now resolves
  *         if not has_proj_data():             # <<<<<<<<<<<<<<
- *             raise ValueError(f"Found PROJ data directory at {wk_path} but it does not appear to correctly contain PROJ data files")
- *         return
+ *             raise ValueError(
+ *                 f"Found PROJ data directory at {wk_path} but it does not appear to "
  */
     }
 
-    /* "pyogrio/_ogr.pyx":255
- *         if not has_proj_data():
- *             raise ValueError(f"Found PROJ data directory at {wk_path} but it does not appear to correctly contain PROJ data files")
+    /* "pyogrio/_ogr.pyx":271
+ *                 "correctly contain PROJ data files"
+ *             )
  *         return             # <<<<<<<<<<<<<<
  * 
- *     warnings.warn("Could not detect PROJ data files.  Set PROJ_LIB environment variable to the correct path.", RuntimeWarning)
+ *     warnings.warn(
  */
     __Pyx_XDECREF(__pyx_r);
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "pyogrio/_ogr.pyx":250
+    /* "pyogrio/_ogr.pyx":263
  * 
- *     wk_path = os.path.join(sys.prefix, 'share', 'proj')
+ *     wk_path = os.path.join(sys.prefix, "share", "proj")
  *     if os.path.exists(wk_path):             # <<<<<<<<<<<<<<
  *         set_proj_search_path(wk_path)
  *         # verify that this now resolves
  */
   }
 
-  /* "pyogrio/_ogr.pyx":257
+  /* "pyogrio/_ogr.pyx":273
  *         return
  * 
- *     warnings.warn("Could not detect PROJ data files.  Set PROJ_LIB environment variable to the correct path.", RuntimeWarning)             # <<<<<<<<<<<<<<
- * 
- * 
+ *     warnings.warn(             # <<<<<<<<<<<<<<
+ *             "Could not detect PROJ data files. Set PROJ_LIB environment variable to "
+ *             "the correct path.", RuntimeWarning)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_warnings); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 257, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_warnings); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 273, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_warn); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 257, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_warn); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 273, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 257, __pyx_L1_error)
+
+  /* "pyogrio/_ogr.pyx":275
+ *     warnings.warn(
+ *             "Could not detect PROJ data files. Set PROJ_LIB environment variable to "
+ *             "the correct path.", RuntimeWarning)             # <<<<<<<<<<<<<<
+ * 
+ * 
+ */
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 273, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyogrio/_ogr.pyx":227
+  /* "pyogrio/_ogr.pyx":238
  * 
  * 
  * def init_proj_data():             # <<<<<<<<<<<<<<
@@ -6878,7 +6826,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_24init_proj_data(CYTHON_UNUSED PyObject
   return __pyx_r;
 }
 
-/* "pyogrio/_ogr.pyx":260
+/* "pyogrio/_ogr.pyx":278
  * 
  * 
  * def _register_drivers():             # <<<<<<<<<<<<<<
@@ -6907,7 +6855,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_26_register_drivers(CYTHON_UNUSED PyObj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_register_drivers", 1);
 
-  /* "pyogrio/_ogr.pyx":262
+  /* "pyogrio/_ogr.pyx":280
  * def _register_drivers():
  *     # Register all drivers
  *     GDALAllRegister()             # <<<<<<<<<<<<<<
@@ -6916,7 +6864,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_26_register_drivers(CYTHON_UNUSED PyObj
  */
   GDALAllRegister();
 
-  /* "pyogrio/_ogr.pyx":260
+  /* "pyogrio/_ogr.pyx":278
  * 
  * 
  * def _register_drivers():             # <<<<<<<<<<<<<<
@@ -6931,7 +6879,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_26_register_drivers(CYTHON_UNUSED PyObj
   return __pyx_r;
 }
 
-/* "pyogrio/_ogr.pyx":265
+/* "pyogrio/_ogr.pyx":283
  * 
  * 
  * def _get_driver_metadata_item(driver, metadata_item):             # <<<<<<<<<<<<<<
@@ -6996,7 +6944,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 265, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 283, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -7004,14 +6952,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 265, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 283, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("_get_driver_metadata_item", 1, 2, 2, 1); __PYX_ERR(0, 265, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("_get_driver_metadata_item", 1, 2, 2, 1); __PYX_ERR(0, 283, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "_get_driver_metadata_item") < 0)) __PYX_ERR(0, 265, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "_get_driver_metadata_item") < 0)) __PYX_ERR(0, 283, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 2)) {
       goto __pyx_L5_argtuple_error;
@@ -7024,7 +6972,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("_get_driver_metadata_item", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 265, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("_get_driver_metadata_item", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 283, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -7089,7 +7037,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_get_driver_metadata_item", 1);
 
-  /* "pyogrio/_ogr.pyx":281
+  /* "pyogrio/_ogr.pyx":299
  *         Metadata item
  *     """
  *     cdef const char* metadata_c = NULL             # <<<<<<<<<<<<<<
@@ -7098,7 +7046,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
  */
   __pyx_v_metadata_c = NULL;
 
-  /* "pyogrio/_ogr.pyx":282
+  /* "pyogrio/_ogr.pyx":300
  *     """
  *     cdef const char* metadata_c = NULL
  *     cdef void *cogr_driver = NULL             # <<<<<<<<<<<<<<
@@ -7107,11 +7055,11 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
  */
   __pyx_v_cogr_driver = NULL;
 
-  /* "pyogrio/_ogr.pyx":284
+  /* "pyogrio/_ogr.pyx":302
  *     cdef void *cogr_driver = NULL
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         cogr_driver = exc_wrap_pointer(GDALGetDriverByName(driver.encode('UTF-8')))
+ *         cogr_driver = check_pointer(GDALGetDriverByName(driver.encode("UTF-8")))
  *     except NullPointerError:
  */
   {
@@ -7123,14 +7071,14 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "pyogrio/_ogr.pyx":285
+      /* "pyogrio/_ogr.pyx":303
  * 
  *     try:
- *         cogr_driver = exc_wrap_pointer(GDALGetDriverByName(driver.encode('UTF-8')))             # <<<<<<<<<<<<<<
+ *         cogr_driver = check_pointer(GDALGetDriverByName(driver.encode("UTF-8")))             # <<<<<<<<<<<<<<
  *     except NullPointerError:
  *         raise DataSourceError(
  */
-      __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_driver, __pyx_n_s_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 285, __pyx_L3_error)
+      __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_driver, __pyx_n_s_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 303, __pyx_L3_error)
       __Pyx_GOTREF(__pyx_t_5);
       __pyx_t_6 = NULL;
       __pyx_t_7 = 0;
@@ -7150,20 +7098,20 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
         PyObject *__pyx_callargs[2] = {__pyx_t_6, __pyx_kp_u_UTF_8};
         __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_7, 1+__pyx_t_7);
         __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
-        if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 285, __pyx_L3_error)
+        if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 303, __pyx_L3_error)
         __Pyx_GOTREF(__pyx_t_4);
         __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       }
-      __pyx_t_8 = __Pyx_PyObject_AsString(__pyx_t_4); if (unlikely((!__pyx_t_8) && PyErr_Occurred())) __PYX_ERR(0, 285, __pyx_L3_error)
-      __pyx_t_9 = __pyx_f_7pyogrio_4_err_exc_wrap_pointer(GDALGetDriverByName(__pyx_t_8)); if (unlikely(__pyx_t_9 == ((void *)NULL))) __PYX_ERR(0, 285, __pyx_L3_error)
+      __pyx_t_8 = __Pyx_PyObject_AsString(__pyx_t_4); if (unlikely((!__pyx_t_8) && PyErr_Occurred())) __PYX_ERR(0, 303, __pyx_L3_error)
+      __pyx_t_9 = __pyx_f_7pyogrio_4_err_check_pointer(GDALGetDriverByName(__pyx_t_8)); if (unlikely(__pyx_t_9 == ((void *)NULL))) __PYX_ERR(0, 303, __pyx_L3_error)
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __pyx_v_cogr_driver = __pyx_t_9;
 
-      /* "pyogrio/_ogr.pyx":284
+      /* "pyogrio/_ogr.pyx":302
  *     cdef void *cogr_driver = NULL
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         cogr_driver = exc_wrap_pointer(GDALGetDriverByName(driver.encode('UTF-8')))
+ *         cogr_driver = check_pointer(GDALGetDriverByName(driver.encode("UTF-8")))
  *     except NullPointerError:
  */
     }
@@ -7176,15 +7124,15 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
     __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-    /* "pyogrio/_ogr.pyx":286
+    /* "pyogrio/_ogr.pyx":304
  *     try:
- *         cogr_driver = exc_wrap_pointer(GDALGetDriverByName(driver.encode('UTF-8')))
+ *         cogr_driver = check_pointer(GDALGetDriverByName(driver.encode("UTF-8")))
  *     except NullPointerError:             # <<<<<<<<<<<<<<
  *         raise DataSourceError(
  *             f"Could not obtain driver: {driver} (check that it was installed "
  */
     __Pyx_ErrFetch(&__pyx_t_4, &__pyx_t_5, &__pyx_t_6);
-    __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_NullPointerError); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 286, __pyx_L5_except_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_NullPointerError); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 304, __pyx_L5_except_error)
     __Pyx_GOTREF(__pyx_t_10);
     __pyx_t_11 = __Pyx_PyErr_GivenExceptionMatches(__pyx_t_4, __pyx_t_10);
     __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
@@ -7192,29 +7140,29 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
     __pyx_t_4 = 0; __pyx_t_5 = 0; __pyx_t_6 = 0;
     if (__pyx_t_11) {
       __Pyx_AddTraceback("pyogrio._ogr._get_driver_metadata_item", __pyx_clineno, __pyx_lineno, __pyx_filename);
-      if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_5, &__pyx_t_4) < 0) __PYX_ERR(0, 286, __pyx_L5_except_error)
+      if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_5, &__pyx_t_4) < 0) __PYX_ERR(0, 304, __pyx_L5_except_error)
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_5);
       __Pyx_XGOTREF(__pyx_t_4);
 
-      /* "pyogrio/_ogr.pyx":287
- *         cogr_driver = exc_wrap_pointer(GDALGetDriverByName(driver.encode('UTF-8')))
+      /* "pyogrio/_ogr.pyx":305
+ *         cogr_driver = check_pointer(GDALGetDriverByName(driver.encode("UTF-8")))
  *     except NullPointerError:
  *         raise DataSourceError(             # <<<<<<<<<<<<<<
  *             f"Could not obtain driver: {driver} (check that it was installed "
  *             "correctly into GDAL)"
  */
-      __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_n_s_DataSourceError); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 287, __pyx_L5_except_error)
+      __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_n_s_DataSourceError); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 305, __pyx_L5_except_error)
       __Pyx_GOTREF(__pyx_t_12);
 
-      /* "pyogrio/_ogr.pyx":288
+      /* "pyogrio/_ogr.pyx":306
  *     except NullPointerError:
  *         raise DataSourceError(
  *             f"Could not obtain driver: {driver} (check that it was installed "             # <<<<<<<<<<<<<<
  *             "correctly into GDAL)"
  *         )
  */
-      __pyx_t_13 = PyTuple_New(3); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 288, __pyx_L5_except_error)
+      __pyx_t_13 = PyTuple_New(3); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 306, __pyx_L5_except_error)
       __Pyx_GOTREF(__pyx_t_13);
       __pyx_t_14 = 0;
       __pyx_t_15 = 127;
@@ -7222,7 +7170,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
       __pyx_t_14 += 25;
       __Pyx_GIVEREF(__pyx_kp_u_Could_not_obtain_driver);
       PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_kp_u_Could_not_obtain_driver);
-      __pyx_t_16 = __Pyx_PyObject_FormatSimple(__pyx_v_driver, __pyx_empty_unicode); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 288, __pyx_L5_except_error)
+      __pyx_t_16 = __Pyx_PyObject_FormatSimple(__pyx_v_driver, __pyx_empty_unicode); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 306, __pyx_L5_except_error)
       __Pyx_GOTREF(__pyx_t_16);
       __pyx_t_15 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_16) > __pyx_t_15) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_16) : __pyx_t_15;
       __pyx_t_14 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_16);
@@ -7233,7 +7181,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
       __pyx_t_14 += 50;
       __Pyx_GIVEREF(__pyx_kp_u_check_that_it_was_installed_cor);
       PyTuple_SET_ITEM(__pyx_t_13, 2, __pyx_kp_u_check_that_it_was_installed_cor);
-      __pyx_t_16 = __Pyx_PyUnicode_Join(__pyx_t_13, 3, __pyx_t_14, __pyx_t_15); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 288, __pyx_L5_except_error)
+      __pyx_t_16 = __Pyx_PyUnicode_Join(__pyx_t_13, 3, __pyx_t_14, __pyx_t_15); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 306, __pyx_L5_except_error)
       __Pyx_GOTREF(__pyx_t_16);
       __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
       __pyx_t_13 = NULL;
@@ -7255,16 +7203,16 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
         __pyx_t_10 = __Pyx_PyObject_FastCall(__pyx_t_12, __pyx_callargs+1-__pyx_t_7, 1+__pyx_t_7);
         __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;
         __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;
-        if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 287, __pyx_L5_except_error)
+        if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 305, __pyx_L5_except_error)
         __Pyx_GOTREF(__pyx_t_10);
         __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
       }
       __Pyx_Raise(__pyx_t_10, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __PYX_ERR(0, 287, __pyx_L5_except_error)
+      __PYX_ERR(0, 305, __pyx_L5_except_error)
     }
 
-    /* "pyogrio/_ogr.pyx":291
+    /* "pyogrio/_ogr.pyx":309
  *             "correctly into GDAL)"
  *         )
  *     except CPLE_BaseError as exc:             # <<<<<<<<<<<<<<
@@ -7272,7 +7220,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
  * 
  */
     __Pyx_ErrFetch(&__pyx_t_4, &__pyx_t_5, &__pyx_t_6);
-    __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 291, __pyx_L5_except_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_10, __pyx_n_s_CPLE_BaseError); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 309, __pyx_L5_except_error)
     __Pyx_GOTREF(__pyx_t_10);
     __pyx_t_11 = __Pyx_PyErr_GivenExceptionMatches(__pyx_t_4, __pyx_t_10);
     __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
@@ -7280,7 +7228,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
     __pyx_t_4 = 0; __pyx_t_5 = 0; __pyx_t_6 = 0;
     if (__pyx_t_11) {
       __Pyx_AddTraceback("pyogrio._ogr._get_driver_metadata_item", __pyx_clineno, __pyx_lineno, __pyx_filename);
-      if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_5, &__pyx_t_4) < 0) __PYX_ERR(0, 291, __pyx_L5_except_error)
+      if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_5, &__pyx_t_4) < 0) __PYX_ERR(0, 309, __pyx_L5_except_error)
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_5);
       __Pyx_XGOTREF(__pyx_t_4);
@@ -7288,16 +7236,16 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
       __pyx_v_exc = __pyx_t_5;
       /*try:*/ {
 
-        /* "pyogrio/_ogr.pyx":292
+        /* "pyogrio/_ogr.pyx":310
  *         )
  *     except CPLE_BaseError as exc:
  *         raise DataSourceError(str(exc))             # <<<<<<<<<<<<<<
  * 
- *     metadata_c = GDALGetMetadataItem(cogr_driver, metadata_item.encode('UTF-8'), NULL)
+ *     metadata_c = GDALGetMetadataItem(cogr_driver, metadata_item.encode("UTF-8"), NULL)
  */
-        __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_n_s_DataSourceError); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 292, __pyx_L16_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_n_s_DataSourceError); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 310, __pyx_L16_error)
         __Pyx_GOTREF(__pyx_t_12);
-        __pyx_t_16 = __Pyx_PyObject_Unicode(__pyx_v_exc); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 292, __pyx_L16_error)
+        __pyx_t_16 = __Pyx_PyObject_Unicode(__pyx_v_exc); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 310, __pyx_L16_error)
         __Pyx_GOTREF(__pyx_t_16);
         __pyx_t_13 = NULL;
         __pyx_t_7 = 0;
@@ -7318,16 +7266,16 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
           __pyx_t_10 = __Pyx_PyObject_FastCall(__pyx_t_12, __pyx_callargs+1-__pyx_t_7, 1+__pyx_t_7);
           __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;
           __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;
-          if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 292, __pyx_L16_error)
+          if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 310, __pyx_L16_error)
           __Pyx_GOTREF(__pyx_t_10);
           __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
         }
         __Pyx_Raise(__pyx_t_10, 0, 0, 0);
         __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        __PYX_ERR(0, 292, __pyx_L16_error)
+        __PYX_ERR(0, 310, __pyx_L16_error)
       }
 
-      /* "pyogrio/_ogr.pyx":291
+      /* "pyogrio/_ogr.pyx":309
  *             "correctly into GDAL)"
  *         )
  *     except CPLE_BaseError as exc:             # <<<<<<<<<<<<<<
@@ -7374,11 +7322,11 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
     }
     goto __pyx_L5_except_error;
 
-    /* "pyogrio/_ogr.pyx":284
+    /* "pyogrio/_ogr.pyx":302
  *     cdef void *cogr_driver = NULL
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         cogr_driver = exc_wrap_pointer(GDALGetDriverByName(driver.encode('UTF-8')))
+ *         cogr_driver = check_pointer(GDALGetDriverByName(driver.encode("UTF-8")))
  *     except NullPointerError:
  */
     __pyx_L5_except_error:;
@@ -7390,14 +7338,14 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
     __pyx_L8_try_end:;
   }
 
-  /* "pyogrio/_ogr.pyx":294
+  /* "pyogrio/_ogr.pyx":312
  *         raise DataSourceError(str(exc))
  * 
- *     metadata_c = GDALGetMetadataItem(cogr_driver, metadata_item.encode('UTF-8'), NULL)             # <<<<<<<<<<<<<<
+ *     metadata_c = GDALGetMetadataItem(cogr_driver, metadata_item.encode("UTF-8"), NULL)             # <<<<<<<<<<<<<<
  * 
  *     metadata = None
  */
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_metadata_item, __pyx_n_s_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 294, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_metadata_item, __pyx_n_s_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 312, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __pyx_t_6 = NULL;
   __pyx_t_7 = 0;
@@ -7417,16 +7365,16 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
     PyObject *__pyx_callargs[2] = {__pyx_t_6, __pyx_kp_u_UTF_8};
     __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_7, 1+__pyx_t_7);
     __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
-    if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 294, __pyx_L1_error)
+    if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 312, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   }
-  __pyx_t_25 = __Pyx_PyObject_AsString(__pyx_t_4); if (unlikely((!__pyx_t_25) && PyErr_Occurred())) __PYX_ERR(0, 294, __pyx_L1_error)
+  __pyx_t_25 = __Pyx_PyObject_AsString(__pyx_t_4); if (unlikely((!__pyx_t_25) && PyErr_Occurred())) __PYX_ERR(0, 312, __pyx_L1_error)
   __pyx_v_metadata_c = GDALGetMetadataItem(__pyx_v_cogr_driver, __pyx_t_25, NULL);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyogrio/_ogr.pyx":296
- *     metadata_c = GDALGetMetadataItem(cogr_driver, metadata_item.encode('UTF-8'), NULL)
+  /* "pyogrio/_ogr.pyx":314
+ *     metadata_c = GDALGetMetadataItem(cogr_driver, metadata_item.encode("UTF-8"), NULL)
  * 
  *     metadata = None             # <<<<<<<<<<<<<<
  *     if metadata_c != NULL:
@@ -7435,36 +7383,36 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
   __Pyx_INCREF(Py_None);
   __pyx_v_metadata = Py_None;
 
-  /* "pyogrio/_ogr.pyx":297
+  /* "pyogrio/_ogr.pyx":315
  * 
  *     metadata = None
  *     if metadata_c != NULL:             # <<<<<<<<<<<<<<
  *         metadata = metadata_c
- *         metadata = metadata.decode('UTF-8')
+ *         metadata = metadata.decode("UTF-8")
  */
   __pyx_t_26 = (__pyx_v_metadata_c != NULL);
   if (__pyx_t_26) {
 
-    /* "pyogrio/_ogr.pyx":298
+    /* "pyogrio/_ogr.pyx":316
  *     metadata = None
  *     if metadata_c != NULL:
  *         metadata = metadata_c             # <<<<<<<<<<<<<<
- *         metadata = metadata.decode('UTF-8')
+ *         metadata = metadata.decode("UTF-8")
  *         if len(metadata) == 0:
  */
-    __pyx_t_4 = __Pyx_PyBytes_FromString(__pyx_v_metadata_c); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 298, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyBytes_FromString(__pyx_v_metadata_c); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 316, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF_SET(__pyx_v_metadata, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "pyogrio/_ogr.pyx":299
+    /* "pyogrio/_ogr.pyx":317
  *     if metadata_c != NULL:
  *         metadata = metadata_c
- *         metadata = metadata.decode('UTF-8')             # <<<<<<<<<<<<<<
+ *         metadata = metadata.decode("UTF-8")             # <<<<<<<<<<<<<<
  *         if len(metadata) == 0:
  *             metadata = None
  */
-    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_metadata, __pyx_n_s_decode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 299, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_metadata, __pyx_n_s_decode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 317, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __pyx_t_6 = NULL;
     __pyx_t_7 = 0;
@@ -7484,26 +7432,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
       PyObject *__pyx_callargs[2] = {__pyx_t_6, __pyx_kp_u_UTF_8};
       __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_7, 1+__pyx_t_7);
       __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
-      if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 299, __pyx_L1_error)
+      if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 317, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     }
     __Pyx_DECREF_SET(__pyx_v_metadata, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "pyogrio/_ogr.pyx":300
+    /* "pyogrio/_ogr.pyx":318
  *         metadata = metadata_c
- *         metadata = metadata.decode('UTF-8')
+ *         metadata = metadata.decode("UTF-8")
  *         if len(metadata) == 0:             # <<<<<<<<<<<<<<
  *             metadata = None
  * 
  */
-    __pyx_t_14 = PyObject_Length(__pyx_v_metadata); if (unlikely(__pyx_t_14 == ((Py_ssize_t)-1))) __PYX_ERR(0, 300, __pyx_L1_error)
+    __pyx_t_14 = PyObject_Length(__pyx_v_metadata); if (unlikely(__pyx_t_14 == ((Py_ssize_t)-1))) __PYX_ERR(0, 318, __pyx_L1_error)
     __pyx_t_26 = (__pyx_t_14 == 0);
     if (__pyx_t_26) {
 
-      /* "pyogrio/_ogr.pyx":301
- *         metadata = metadata.decode('UTF-8')
+      /* "pyogrio/_ogr.pyx":319
+ *         metadata = metadata.decode("UTF-8")
  *         if len(metadata) == 0:
  *             metadata = None             # <<<<<<<<<<<<<<
  * 
@@ -7512,25 +7460,25 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
       __Pyx_INCREF(Py_None);
       __Pyx_DECREF_SET(__pyx_v_metadata, Py_None);
 
-      /* "pyogrio/_ogr.pyx":300
+      /* "pyogrio/_ogr.pyx":318
  *         metadata = metadata_c
- *         metadata = metadata.decode('UTF-8')
+ *         metadata = metadata.decode("UTF-8")
  *         if len(metadata) == 0:             # <<<<<<<<<<<<<<
  *             metadata = None
  * 
  */
     }
 
-    /* "pyogrio/_ogr.pyx":297
+    /* "pyogrio/_ogr.pyx":315
  * 
  *     metadata = None
  *     if metadata_c != NULL:             # <<<<<<<<<<<<<<
  *         metadata = metadata_c
- *         metadata = metadata.decode('UTF-8')
+ *         metadata = metadata.decode("UTF-8")
  */
   }
 
-  /* "pyogrio/_ogr.pyx":303
+  /* "pyogrio/_ogr.pyx":321
  *             metadata = None
  * 
  *     return metadata             # <<<<<<<<<<<<<<
@@ -7542,7 +7490,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
   __pyx_r = __pyx_v_metadata;
   goto __pyx_L0;
 
-  /* "pyogrio/_ogr.pyx":265
+  /* "pyogrio/_ogr.pyx":283
  * 
  * 
  * def _get_driver_metadata_item(driver, metadata_item):             # <<<<<<<<<<<<<<
@@ -7569,7 +7517,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_28_get_driver_metadata_item(CYTHON_UNUS
   return __pyx_r;
 }
 
-/* "pyogrio/_ogr.pyx":306
+/* "pyogrio/_ogr.pyx":324
  * 
  * 
  * def _get_drivers_for_path(path):             # <<<<<<<<<<<<<<
@@ -7630,12 +7578,12 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 306, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 324, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "_get_drivers_for_path") < 0)) __PYX_ERR(0, 306, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "_get_drivers_for_path") < 0)) __PYX_ERR(0, 324, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 1)) {
       goto __pyx_L5_argtuple_error;
@@ -7646,7 +7594,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("_get_drivers_for_path", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 306, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("_get_drivers_for_path", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 324, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -7704,7 +7652,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
   __Pyx_RefNannySetupContext("_get_drivers_for_path", 0);
   __Pyx_INCREF(__pyx_v_path);
 
-  /* "pyogrio/_ogr.pyx":307
+  /* "pyogrio/_ogr.pyx":325
  * 
  * def _get_drivers_for_path(path):
  *     cdef OGRSFDriverH driver = NULL             # <<<<<<<<<<<<<<
@@ -7713,16 +7661,16 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
  */
   __pyx_v_driver = NULL;
 
-  /* "pyogrio/_ogr.pyx":311
+  /* "pyogrio/_ogr.pyx":329
  *     cdef char *name_c
  * 
  *     path = str(path).lower()             # <<<<<<<<<<<<<<
  * 
  *     parts = os.path.splitext(path)
  */
-  __pyx_t_2 = __Pyx_PyObject_Unicode(__pyx_v_path); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 311, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_Unicode(__pyx_v_path); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 329, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_lower); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 311, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_lower); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 329, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_t_2 = NULL;
@@ -7743,26 +7691,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
     PyObject *__pyx_callargs[2] = {__pyx_t_2, NULL};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_4, 0+__pyx_t_4);
     __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 311, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 329, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
   __Pyx_DECREF_SET(__pyx_v_path, __pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "pyogrio/_ogr.pyx":313
+  /* "pyogrio/_ogr.pyx":331
  *     path = str(path).lower()
  * 
  *     parts = os.path.splitext(path)             # <<<<<<<<<<<<<<
  *     if len(parts) == 2 and len(parts[1]) > 1:
  *         ext = parts[1][1:]
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_os); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 313, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_os); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 331, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_path); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 313, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_path); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 331, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_splitext); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 313, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_splitext); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 331, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_t_2 = NULL;
@@ -7783,52 +7731,52 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
     PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_path};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4);
     __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 313, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 331, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
   __pyx_v_parts = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "pyogrio/_ogr.pyx":314
+  /* "pyogrio/_ogr.pyx":332
  * 
  *     parts = os.path.splitext(path)
  *     if len(parts) == 2 and len(parts[1]) > 1:             # <<<<<<<<<<<<<<
  *         ext = parts[1][1:]
  *     else:
  */
-  __pyx_t_6 = PyObject_Length(__pyx_v_parts); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 314, __pyx_L1_error)
+  __pyx_t_6 = PyObject_Length(__pyx_v_parts); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 332, __pyx_L1_error)
   __pyx_t_7 = (__pyx_t_6 == 2);
   if (__pyx_t_7) {
   } else {
     __pyx_t_5 = __pyx_t_7;
     goto __pyx_L4_bool_binop_done;
   }
-  __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_parts, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 314, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_parts, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 332, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_6 = PyObject_Length(__pyx_t_1); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 314, __pyx_L1_error)
+  __pyx_t_6 = PyObject_Length(__pyx_t_1); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 332, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_t_7 = (__pyx_t_6 > 1);
   __pyx_t_5 = __pyx_t_7;
   __pyx_L4_bool_binop_done:;
   if (__pyx_t_5) {
 
-    /* "pyogrio/_ogr.pyx":315
+    /* "pyogrio/_ogr.pyx":333
  *     parts = os.path.splitext(path)
  *     if len(parts) == 2 and len(parts[1]) > 1:
  *         ext = parts[1][1:]             # <<<<<<<<<<<<<<
  *     else:
  *         ext = None
  */
-    __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_parts, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 315, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_parts, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 333, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_3 = __Pyx_PyObject_GetSlice(__pyx_t_1, 1, 0, NULL, NULL, &__pyx_slice__5, 1, 0, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 315, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_GetSlice(__pyx_t_1, 1, 0, NULL, NULL, &__pyx_slice__5, 1, 0, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 333, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_v_ext = __pyx_t_3;
     __pyx_t_3 = 0;
 
-    /* "pyogrio/_ogr.pyx":314
+    /* "pyogrio/_ogr.pyx":332
  * 
  *     parts = os.path.splitext(path)
  *     if len(parts) == 2 and len(parts[1]) > 1:             # <<<<<<<<<<<<<<
@@ -7838,12 +7786,12 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
     goto __pyx_L3;
   }
 
-  /* "pyogrio/_ogr.pyx":317
+  /* "pyogrio/_ogr.pyx":335
  *         ext = parts[1][1:]
  *     else:
  *         ext = None             # <<<<<<<<<<<<<<
  * 
- * 
+ *     # allow specific drivers to have a .zip extension to match GDAL behavior
  */
   /*else*/ {
     __Pyx_INCREF(Py_None);
@@ -7851,24 +7799,24 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
   }
   __pyx_L3:;
 
-  /* "pyogrio/_ogr.pyx":321
+  /* "pyogrio/_ogr.pyx":338
  * 
  *     # allow specific drivers to have a .zip extension to match GDAL behavior
- *     if ext == 'zip':             # <<<<<<<<<<<<<<
- *         if path.endswith('.shp.zip'):
- *             ext = 'shp.zip'
+ *     if ext == "zip":             # <<<<<<<<<<<<<<
+ *         if path.endswith(".shp.zip"):
+ *             ext = "shp.zip"
  */
-  __pyx_t_5 = (__Pyx_PyUnicode_Equals(__pyx_v_ext, __pyx_n_u_zip, Py_EQ)); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 321, __pyx_L1_error)
+  __pyx_t_5 = (__Pyx_PyUnicode_Equals(__pyx_v_ext, __pyx_n_u_zip, Py_EQ)); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 338, __pyx_L1_error)
   if (__pyx_t_5) {
 
-    /* "pyogrio/_ogr.pyx":322
+    /* "pyogrio/_ogr.pyx":339
  *     # allow specific drivers to have a .zip extension to match GDAL behavior
- *     if ext == 'zip':
- *         if path.endswith('.shp.zip'):             # <<<<<<<<<<<<<<
- *             ext = 'shp.zip'
- *         elif path.endswith('.gpkg.zip'):
+ *     if ext == "zip":
+ *         if path.endswith(".shp.zip"):             # <<<<<<<<<<<<<<
+ *             ext = "shp.zip"
+ *         elif path.endswith(".gpkg.zip"):
  */
-    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_path, __pyx_n_s_endswith); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 322, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_path, __pyx_n_s_endswith); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 339, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_2 = NULL;
     __pyx_t_4 = 0;
@@ -7888,42 +7836,42 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
       PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_kp_u_shp_zip};
       __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4);
       __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 322, __pyx_L1_error)
+      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 339, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     }
-    __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 322, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 339, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (__pyx_t_5) {
 
-      /* "pyogrio/_ogr.pyx":323
- *     if ext == 'zip':
- *         if path.endswith('.shp.zip'):
- *             ext = 'shp.zip'             # <<<<<<<<<<<<<<
- *         elif path.endswith('.gpkg.zip'):
- *             ext = 'gpkg.zip'
+      /* "pyogrio/_ogr.pyx":340
+ *     if ext == "zip":
+ *         if path.endswith(".shp.zip"):
+ *             ext = "shp.zip"             # <<<<<<<<<<<<<<
+ *         elif path.endswith(".gpkg.zip"):
+ *             ext = "gpkg.zip"
  */
       __Pyx_INCREF(__pyx_kp_u_shp_zip_2);
       __Pyx_DECREF_SET(__pyx_v_ext, __pyx_kp_u_shp_zip_2);
 
-      /* "pyogrio/_ogr.pyx":322
+      /* "pyogrio/_ogr.pyx":339
  *     # allow specific drivers to have a .zip extension to match GDAL behavior
- *     if ext == 'zip':
- *         if path.endswith('.shp.zip'):             # <<<<<<<<<<<<<<
- *             ext = 'shp.zip'
- *         elif path.endswith('.gpkg.zip'):
+ *     if ext == "zip":
+ *         if path.endswith(".shp.zip"):             # <<<<<<<<<<<<<<
+ *             ext = "shp.zip"
+ *         elif path.endswith(".gpkg.zip"):
  */
       goto __pyx_L7;
     }
 
-    /* "pyogrio/_ogr.pyx":324
- *         if path.endswith('.shp.zip'):
- *             ext = 'shp.zip'
- *         elif path.endswith('.gpkg.zip'):             # <<<<<<<<<<<<<<
- *             ext = 'gpkg.zip'
+    /* "pyogrio/_ogr.pyx":341
+ *         if path.endswith(".shp.zip"):
+ *             ext = "shp.zip"
+ *         elif path.endswith(".gpkg.zip"):             # <<<<<<<<<<<<<<
+ *             ext = "gpkg.zip"
  * 
  */
-    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_path, __pyx_n_s_endswith); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 324, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_path, __pyx_n_s_endswith); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 341, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_2 = NULL;
     __pyx_t_4 = 0;
@@ -7943,56 +7891,56 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
       PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_kp_u_gpkg_zip};
       __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4);
       __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 324, __pyx_L1_error)
+      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 341, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     }
-    __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 324, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 341, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (__pyx_t_5) {
 
-      /* "pyogrio/_ogr.pyx":325
- *             ext = 'shp.zip'
- *         elif path.endswith('.gpkg.zip'):
- *             ext = 'gpkg.zip'             # <<<<<<<<<<<<<<
+      /* "pyogrio/_ogr.pyx":342
+ *             ext = "shp.zip"
+ *         elif path.endswith(".gpkg.zip"):
+ *             ext = "gpkg.zip"             # <<<<<<<<<<<<<<
  * 
  *     drivers = []
  */
       __Pyx_INCREF(__pyx_kp_u_gpkg_zip_2);
       __Pyx_DECREF_SET(__pyx_v_ext, __pyx_kp_u_gpkg_zip_2);
 
-      /* "pyogrio/_ogr.pyx":324
- *         if path.endswith('.shp.zip'):
- *             ext = 'shp.zip'
- *         elif path.endswith('.gpkg.zip'):             # <<<<<<<<<<<<<<
- *             ext = 'gpkg.zip'
+      /* "pyogrio/_ogr.pyx":341
+ *         if path.endswith(".shp.zip"):
+ *             ext = "shp.zip"
+ *         elif path.endswith(".gpkg.zip"):             # <<<<<<<<<<<<<<
+ *             ext = "gpkg.zip"
  * 
  */
     }
     __pyx_L7:;
 
-    /* "pyogrio/_ogr.pyx":321
+    /* "pyogrio/_ogr.pyx":338
  * 
  *     # allow specific drivers to have a .zip extension to match GDAL behavior
- *     if ext == 'zip':             # <<<<<<<<<<<<<<
- *         if path.endswith('.shp.zip'):
- *             ext = 'shp.zip'
+ *     if ext == "zip":             # <<<<<<<<<<<<<<
+ *         if path.endswith(".shp.zip"):
+ *             ext = "shp.zip"
  */
   }
 
-  /* "pyogrio/_ogr.pyx":327
- *             ext = 'gpkg.zip'
+  /* "pyogrio/_ogr.pyx":344
+ *             ext = "gpkg.zip"
  * 
  *     drivers = []             # <<<<<<<<<<<<<<
  *     for i in range(OGRGetDriverCount()):
  *         driver = OGRGetDriver(i)
  */
-  __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 327, __pyx_L1_error)
+  __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 344, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __pyx_v_drivers = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "pyogrio/_ogr.pyx":328
+  /* "pyogrio/_ogr.pyx":345
  * 
  *     drivers = []
  *     for i in range(OGRGetDriverCount()):             # <<<<<<<<<<<<<<
@@ -8004,7 +7952,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
   for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) {
     __pyx_v_i = __pyx_t_10;
 
-    /* "pyogrio/_ogr.pyx":329
+    /* "pyogrio/_ogr.pyx":346
  *     drivers = []
  *     for i in range(OGRGetDriverCount()):
  *         driver = OGRGetDriver(i)             # <<<<<<<<<<<<<<
@@ -8013,7 +7961,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
  */
     __pyx_v_driver = OGRGetDriver(__pyx_v_i);
 
-    /* "pyogrio/_ogr.pyx":330
+    /* "pyogrio/_ogr.pyx":347
  *     for i in range(OGRGetDriverCount()):
  *         driver = OGRGetDriver(i)
  *         name_c = <char *>OGR_Dr_GetName(driver)             # <<<<<<<<<<<<<<
@@ -8022,26 +7970,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
  */
     __pyx_v_name_c = ((char *)OGR_Dr_GetName(__pyx_v_driver));
 
-    /* "pyogrio/_ogr.pyx":331
+    /* "pyogrio/_ogr.pyx":348
  *         driver = OGRGetDriver(i)
  *         name_c = <char *>OGR_Dr_GetName(driver)
  *         name = get_string(name_c)             # <<<<<<<<<<<<<<
  * 
  *         if not ogr_driver_supports_write(name):
  */
-    __pyx_t_3 = __pyx_f_7pyogrio_4_ogr_get_string(__pyx_v_name_c, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 331, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_7pyogrio_4_ogr_get_string(__pyx_v_name_c, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 348, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_XDECREF_SET(__pyx_v_name, __pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "pyogrio/_ogr.pyx":333
+    /* "pyogrio/_ogr.pyx":350
  *         name = get_string(name_c)
  * 
  *         if not ogr_driver_supports_write(name):             # <<<<<<<<<<<<<<
  *             continue
  * 
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_ogr_driver_supports_write); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 333, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_ogr_driver_supports_write); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 350, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_2 = NULL;
     __pyx_t_4 = 0;
@@ -8061,16 +8009,16 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
       PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_name};
       __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4);
       __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 333, __pyx_L1_error)
+      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 350, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     }
-    __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 333, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 350, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_t_7 = (!__pyx_t_5);
     if (__pyx_t_7) {
 
-      /* "pyogrio/_ogr.pyx":334
+      /* "pyogrio/_ogr.pyx":351
  * 
  *         if not ogr_driver_supports_write(name):
  *             continue             # <<<<<<<<<<<<<<
@@ -8079,7 +8027,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
  */
       goto __pyx_L8_continue;
 
-      /* "pyogrio/_ogr.pyx":333
+      /* "pyogrio/_ogr.pyx":350
  *         name = get_string(name_c)
  * 
  *         if not ogr_driver_supports_write(name):             # <<<<<<<<<<<<<<
@@ -8088,14 +8036,14 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
  */
     }
 
-    /* "pyogrio/_ogr.pyx":338
+    /* "pyogrio/_ogr.pyx":355
  *         # extensions is a space-delimited list of supported extensions
  *         # for driver
  *         extensions = _get_driver_metadata_item(name, "DMD_EXTENSIONS")             # <<<<<<<<<<<<<<
- *         if ext is not None and extensions is not None and ext in extensions.lower().split(' '):
- *             drivers.append(name)
+ *         if (
+ *             ext is not None
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_get_driver_metadata_item); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 338, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_get_driver_metadata_item); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 355, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_2 = NULL;
     __pyx_t_4 = 0;
@@ -8115,19 +8063,19 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
       PyObject *__pyx_callargs[3] = {__pyx_t_2, __pyx_v_name, __pyx_n_u_DMD_EXTENSIONS};
       __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_4, 2+__pyx_t_4);
       __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 338, __pyx_L1_error)
+      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 355, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     }
     __Pyx_XDECREF_SET(__pyx_v_extensions, __pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "pyogrio/_ogr.pyx":339
- *         # for driver
+    /* "pyogrio/_ogr.pyx":357
  *         extensions = _get_driver_metadata_item(name, "DMD_EXTENSIONS")
- *         if ext is not None and extensions is not None and ext in extensions.lower().split(' '):             # <<<<<<<<<<<<<<
- *             drivers.append(name)
- *         else:
+ *         if (
+ *             ext is not None             # <<<<<<<<<<<<<<
+ *             and extensions is not None
+ *             and ext in extensions.lower().split(" ")
  */
     __pyx_t_5 = (__pyx_v_ext != Py_None);
     if (__pyx_t_5) {
@@ -8135,13 +8083,29 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
       __pyx_t_7 = __pyx_t_5;
       goto __pyx_L12_bool_binop_done;
     }
+
+    /* "pyogrio/_ogr.pyx":358
+ *         if (
+ *             ext is not None
+ *             and extensions is not None             # <<<<<<<<<<<<<<
+ *             and ext in extensions.lower().split(" ")
+ *         ):
+ */
     __pyx_t_5 = (__pyx_v_extensions != Py_None);
     if (__pyx_t_5) {
     } else {
       __pyx_t_7 = __pyx_t_5;
       goto __pyx_L12_bool_binop_done;
     }
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_extensions, __pyx_n_s_lower); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 339, __pyx_L1_error)
+
+    /* "pyogrio/_ogr.pyx":359
+ *             ext is not None
+ *             and extensions is not None
+ *             and ext in extensions.lower().split(" ")             # <<<<<<<<<<<<<<
+ *         ):
+ *             drivers.append(name)
+ */
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_extensions, __pyx_n_s_lower); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 359, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_11 = NULL;
     __pyx_t_4 = 0;
@@ -8161,11 +8125,11 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
       PyObject *__pyx_callargs[2] = {__pyx_t_11, NULL};
       __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 0+__pyx_t_4);
       __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
-      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 339, __pyx_L1_error)
+      if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 359, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_split); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 339, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_split); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 359, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_1 = NULL;
@@ -8186,36 +8150,44 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
       PyObject *__pyx_callargs[2] = {__pyx_t_1, __pyx_kp_u__6};
       __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4);
       __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 339, __pyx_L1_error)
+      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 359, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_5 = (__Pyx_PySequence_ContainsTF(__pyx_v_ext, __pyx_t_3, Py_EQ)); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 339, __pyx_L1_error)
+    __pyx_t_5 = (__Pyx_PySequence_ContainsTF(__pyx_v_ext, __pyx_t_3, Py_EQ)); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 359, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_t_7 = __pyx_t_5;
     __pyx_L12_bool_binop_done:;
-    if (__pyx_t_7) {
 
-      /* "pyogrio/_ogr.pyx":340
+    /* "pyogrio/_ogr.pyx":356
+ *         # for driver
  *         extensions = _get_driver_metadata_item(name, "DMD_EXTENSIONS")
- *         if ext is not None and extensions is not None and ext in extensions.lower().split(' '):
+ *         if (             # <<<<<<<<<<<<<<
+ *             ext is not None
+ *             and extensions is not None
+ */
+    if (__pyx_t_7) {
+
+      /* "pyogrio/_ogr.pyx":361
+ *             and ext in extensions.lower().split(" ")
+ *         ):
  *             drivers.append(name)             # <<<<<<<<<<<<<<
  *         else:
  *             prefix = _get_driver_metadata_item(name, "DMD_CONNECTION_PREFIX")
  */
-      __pyx_t_12 = __Pyx_PyList_Append(__pyx_v_drivers, __pyx_v_name); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 340, __pyx_L1_error)
+      __pyx_t_12 = __Pyx_PyList_Append(__pyx_v_drivers, __pyx_v_name); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 361, __pyx_L1_error)
 
-      /* "pyogrio/_ogr.pyx":339
+      /* "pyogrio/_ogr.pyx":356
  *         # for driver
  *         extensions = _get_driver_metadata_item(name, "DMD_EXTENSIONS")
- *         if ext is not None and extensions is not None and ext in extensions.lower().split(' '):             # <<<<<<<<<<<<<<
- *             drivers.append(name)
- *         else:
+ *         if (             # <<<<<<<<<<<<<<
+ *             ext is not None
+ *             and extensions is not None
  */
       goto __pyx_L11;
     }
 
-    /* "pyogrio/_ogr.pyx":342
+    /* "pyogrio/_ogr.pyx":363
  *             drivers.append(name)
  *         else:
  *             prefix = _get_driver_metadata_item(name, "DMD_CONNECTION_PREFIX")             # <<<<<<<<<<<<<<
@@ -8223,7 +8195,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
  *                 drivers.append(name)
  */
     /*else*/ {
-      __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_get_driver_metadata_item); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 342, __pyx_L1_error)
+      __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_get_driver_metadata_item); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 363, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __pyx_t_1 = NULL;
       __pyx_t_4 = 0;
@@ -8243,14 +8215,14 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
         PyObject *__pyx_callargs[3] = {__pyx_t_1, __pyx_v_name, __pyx_n_u_DMD_CONNECTION_PREFIX};
         __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 2+__pyx_t_4);
         __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
-        if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 342, __pyx_L1_error)
+        if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 363, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       }
       __Pyx_XDECREF_SET(__pyx_v_prefix, __pyx_t_3);
       __pyx_t_3 = 0;
 
-      /* "pyogrio/_ogr.pyx":343
+      /* "pyogrio/_ogr.pyx":364
  *         else:
  *             prefix = _get_driver_metadata_item(name, "DMD_CONNECTION_PREFIX")
  *             if prefix is not None and path.startswith(prefix.lower()):             # <<<<<<<<<<<<<<
@@ -8263,9 +8235,9 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
         __pyx_t_7 = __pyx_t_5;
         goto __pyx_L16_bool_binop_done;
       }
-      __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_path, __pyx_n_s_startswith); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 343, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_path, __pyx_n_s_startswith); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 364, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_v_prefix, __pyx_n_s_lower); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 343, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_v_prefix, __pyx_n_s_lower); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 364, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __pyx_t_13 = NULL;
       __pyx_t_4 = 0;
@@ -8285,7 +8257,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
         PyObject *__pyx_callargs[2] = {__pyx_t_13, NULL};
         __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_11, __pyx_callargs+1-__pyx_t_4, 0+__pyx_t_4);
         __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;
-        if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 343, __pyx_L1_error)
+        if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 364, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
         __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       }
@@ -8308,26 +8280,26 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
         __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4);
         __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-        if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 343, __pyx_L1_error)
+        if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 364, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       }
-      __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 343, __pyx_L1_error)
+      __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 364, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       __pyx_t_7 = __pyx_t_5;
       __pyx_L16_bool_binop_done:;
       if (__pyx_t_7) {
 
-        /* "pyogrio/_ogr.pyx":344
+        /* "pyogrio/_ogr.pyx":365
  *             prefix = _get_driver_metadata_item(name, "DMD_CONNECTION_PREFIX")
  *             if prefix is not None and path.startswith(prefix.lower()):
  *                 drivers.append(name)             # <<<<<<<<<<<<<<
  * 
  *     return drivers
  */
-        __pyx_t_12 = __Pyx_PyList_Append(__pyx_v_drivers, __pyx_v_name); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 344, __pyx_L1_error)
+        __pyx_t_12 = __Pyx_PyList_Append(__pyx_v_drivers, __pyx_v_name); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 365, __pyx_L1_error)
 
-        /* "pyogrio/_ogr.pyx":343
+        /* "pyogrio/_ogr.pyx":364
  *         else:
  *             prefix = _get_driver_metadata_item(name, "DMD_CONNECTION_PREFIX")
  *             if prefix is not None and path.startswith(prefix.lower()):             # <<<<<<<<<<<<<<
@@ -8340,7 +8312,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
     __pyx_L8_continue:;
   }
 
-  /* "pyogrio/_ogr.pyx":346
+  /* "pyogrio/_ogr.pyx":367
  *                 drivers.append(name)
  * 
  *     return drivers             # <<<<<<<<<<<<<<
@@ -8350,7 +8322,7 @@ static PyObject *__pyx_pf_7pyogrio_4_ogr_30_get_drivers_for_path(CYTHON_UNUSED P
   __pyx_r = __pyx_v_drivers;
   goto __pyx_L0;
 
-  /* "pyogrio/_ogr.pyx":306
+  /* "pyogrio/_ogr.pyx":324
  * 
  * 
  * def _get_drivers_for_path(path):             # <<<<<<<<<<<<<<
@@ -8488,9 +8460,11 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_pyogrio__ogr, __pyx_k_pyogrio__ogr, sizeof(__pyx_k_pyogrio__ogr), 0, 0, 1, 1},
     {&__pyx_kp_s_pyogrio__ogr_pyx, __pyx_k_pyogrio__ogr_pyx, sizeof(__pyx_k_pyogrio__ogr_pyx), 0, 0, 1, 0},
     {&__pyx_n_s_pyogrio_errors, __pyx_k_pyogrio_errors, sizeof(__pyx_k_pyogrio_errors), 0, 0, 1, 1},
+    {&__pyx_n_s_pyx_vtable, __pyx_k_pyx_vtable, sizeof(__pyx_k_pyx_vtable), 0, 0, 1, 1},
     {&__pyx_n_u_r, __pyx_k_r, sizeof(__pyx_k_r), 0, 1, 0, 1},
     {&__pyx_n_s_range, __pyx_k_range, sizeof(__pyx_k_range), 0, 0, 1, 1},
     {&__pyx_n_s_register_drivers, __pyx_k_register_drivers, sizeof(__pyx_k_register_drivers), 0, 0, 1, 1},
+    {&__pyx_n_s_retval, __pyx_k_retval, sizeof(__pyx_k_retval), 0, 0, 1, 1},
     {&__pyx_n_s_revision, __pyx_k_revision, sizeof(__pyx_k_revision), 0, 0, 1, 1},
     {&__pyx_n_s_rstrip, __pyx_k_rstrip, sizeof(__pyx_k_rstrip), 0, 0, 1, 1},
     {&__pyx_n_u_rw, __pyx_k_rw, sizeof(__pyx_k_rw), 0, 1, 0, 1},
@@ -8525,8 +8499,8 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
 /* #### Code section: cached_builtins ### */
 static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
   __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 125, __pyx_L1_error)
-  __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 210, __pyx_L1_error)
-  __pyx_builtin_RuntimeWarning = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeWarning); if (!__pyx_builtin_RuntimeWarning) __PYX_ERR(0, 224, __pyx_L1_error)
+  __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 212, __pyx_L1_error)
+  __pyx_builtin_RuntimeWarning = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeWarning); if (!__pyx_builtin_RuntimeWarning) __PYX_ERR(0, 234, __pyx_L1_error)
   return 0;
   __pyx_L1_error:;
   return -1;
@@ -8537,58 +8511,58 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
 
-  /* "pyogrio/_ogr.pyx":210
+  /* "pyogrio/_ogr.pyx":212
  *         set_gdal_config_options({"GDAL_DATA": wheel_path})
  *         if not has_gdal_data():
- *             raise ValueError("Could not correctly detect GDAL data files installed by pyogrio wheel")             # <<<<<<<<<<<<<<
- *         return
- * 
+ *             raise ValueError(             # <<<<<<<<<<<<<<
+ *                 "Could not correctly detect GDAL data files installed by pyogrio wheel"
+ *             )
  */
-  __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_u_Could_not_correctly_detect_GDAL); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 210, __pyx_L1_error)
+  __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_u_Could_not_correctly_detect_GDAL); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 212, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple_);
   __Pyx_GIVEREF(__pyx_tuple_);
 
-  /* "pyogrio/_ogr.pyx":224
+  /* "pyogrio/_ogr.pyx":231
  *         return
  * 
- *     warnings.warn("Could not detect GDAL data files.  Set GDAL_DATA environment variable to the correct path.", RuntimeWarning)             # <<<<<<<<<<<<<<
- * 
- * 
+ *     warnings.warn(             # <<<<<<<<<<<<<<
+ *         "Could not detect GDAL data files. Set GDAL_DATA environment variable to the "
+ *         "correct path.",
  */
-  __pyx_tuple__2 = PyTuple_Pack(2, __pyx_kp_u_Could_not_detect_GDAL_data_files, __pyx_builtin_RuntimeWarning); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 224, __pyx_L1_error)
+  __pyx_tuple__2 = PyTuple_Pack(2, __pyx_kp_u_Could_not_detect_GDAL_data_files, __pyx_builtin_RuntimeWarning); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 231, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__2);
   __Pyx_GIVEREF(__pyx_tuple__2);
 
-  /* "pyogrio/_ogr.pyx":242
+  /* "pyogrio/_ogr.pyx":253
  *         # verify that this now resolves
  *         if not has_proj_data():
- *             raise ValueError("Could not correctly detect PROJ data files installed by pyogrio wheel")             # <<<<<<<<<<<<<<
- *         return
- * 
+ *             raise ValueError(             # <<<<<<<<<<<<<<
+ *                 "Could not correctly detect PROJ data files installed by pyogrio wheel"
+ *             )
  */
-  __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_u_Could_not_correctly_detect_PROJ); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 242, __pyx_L1_error)
+  __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_u_Could_not_correctly_detect_PROJ); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 253, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__3);
   __Pyx_GIVEREF(__pyx_tuple__3);
 
-  /* "pyogrio/_ogr.pyx":257
+  /* "pyogrio/_ogr.pyx":273
  *         return
  * 
- *     warnings.warn("Could not detect PROJ data files.  Set PROJ_LIB environment variable to the correct path.", RuntimeWarning)             # <<<<<<<<<<<<<<
- * 
- * 
+ *     warnings.warn(             # <<<<<<<<<<<<<<
+ *             "Could not detect PROJ data files. Set PROJ_LIB environment variable to "
+ *             "the correct path.", RuntimeWarning)
  */
-  __pyx_tuple__4 = PyTuple_Pack(2, __pyx_kp_u_Could_not_detect_PROJ_data_files, __pyx_builtin_RuntimeWarning); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 257, __pyx_L1_error)
+  __pyx_tuple__4 = PyTuple_Pack(2, __pyx_kp_u_Could_not_detect_PROJ_data_files, __pyx_builtin_RuntimeWarning); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 273, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__4);
   __Pyx_GIVEREF(__pyx_tuple__4);
 
-  /* "pyogrio/_ogr.pyx":315
+  /* "pyogrio/_ogr.pyx":333
  *     parts = os.path.splitext(path)
  *     if len(parts) == 2 and len(parts[1]) > 1:
  *         ext = parts[1][1:]             # <<<<<<<<<<<<<<
  *     else:
  *         ext = None
  */
-  __pyx_slice__5 = PySlice_New(__pyx_int_1, Py_None, Py_None); if (unlikely(!__pyx_slice__5)) __PYX_ERR(0, 315, __pyx_L1_error)
+  __pyx_slice__5 = PySlice_New(__pyx_int_1, Py_None, Py_None); if (unlikely(!__pyx_slice__5)) __PYX_ERR(0, 333, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_slice__5);
   __Pyx_GIVEREF(__pyx_slice__5);
 
@@ -8633,7 +8607,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  * 
  * def set_gdal_config_options(dict options):             # <<<<<<<<<<<<<<
  *     for name, value in options.items():
- *         name_b = name.encode('utf-8')
+ *         name_b = name.encode("utf-8")
  */
   __pyx_tuple__15 = PyTuple_Pack(7, __pyx_n_s_options, __pyx_n_s_name, __pyx_n_s_value, __pyx_n_s_name_b, __pyx_n_s_name_c, __pyx_n_s_value_b, __pyx_n_s_value_c); if (unlikely(!__pyx_tuple__15)) __PYX_ERR(0, 62, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__15);
@@ -8644,7 +8618,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  * 
  * 
  * def get_gdal_config_option(str name):             # <<<<<<<<<<<<<<
- *     name_b = name.encode('utf-8')
+ *     name_b = name.encode("utf-8")
  *     name_c = name_b
  */
   __pyx_tuple__17 = PyTuple_Pack(5, __pyx_n_s_name, __pyx_n_s_name_b, __pyx_n_s_name_c, __pyx_n_s_value, __pyx_n_s_str_value); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(0, 82, __pyx_L1_error)
@@ -8657,7 +8631,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  * 
  * def ogr_driver_supports_write(driver):             # <<<<<<<<<<<<<<
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == "YES":
  */
   __pyx_tuple__19 = PyTuple_Pack(1, __pyx_n_s_driver); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(0, 103, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__19);
@@ -8669,7 +8643,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  * 
  * def ogr_driver_supports_vsi(driver):             # <<<<<<<<<<<<<<
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == "YES":
  */
   __pyx_codeobj__21 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__19, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_ogr_driver_supports_vsi, 111, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__21)) __PYX_ERR(0, 111, __pyx_L1_error)
 
@@ -8713,64 +8687,64 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  *     """Verify that PROJ library data files are correctly found.
  * 
  */
-  __pyx_tuple__27 = PyTuple_Pack(1, __pyx_n_s_srs); if (unlikely(!__pyx_tuple__27)) __PYX_ERR(0, 172, __pyx_L1_error)
+  __pyx_tuple__27 = PyTuple_Pack(2, __pyx_n_s_srs, __pyx_n_s_retval); if (unlikely(!__pyx_tuple__27)) __PYX_ERR(0, 172, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__27);
   __Pyx_GIVEREF(__pyx_tuple__27);
-  __pyx_codeobj__28 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__27, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_has_proj_data, 172, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__28)) __PYX_ERR(0, 172, __pyx_L1_error)
+  __pyx_codeobj__28 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__27, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_has_proj_data, 172, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__28)) __PYX_ERR(0, 172, __pyx_L1_error)
 
   /* "pyogrio/_ogr.pyx":196
  * 
  * 
  * def init_gdal_data():             # <<<<<<<<<<<<<<
- *     """Set GDAL data search directories in the following precedence:
- *     - wheel copy of gdal_data
+ *     """Set GDAL data search directories.
+ * 
  */
   __pyx_tuple__29 = PyTuple_Pack(2, __pyx_n_s_wheel_path, __pyx_n_s_wk_path); if (unlikely(!__pyx_tuple__29)) __PYX_ERR(0, 196, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__29);
   __Pyx_GIVEREF(__pyx_tuple__29);
   __pyx_codeobj__30 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__29, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_init_gdal_data, 196, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__30)) __PYX_ERR(0, 196, __pyx_L1_error)
 
-  /* "pyogrio/_ogr.pyx":227
+  /* "pyogrio/_ogr.pyx":238
  * 
  * 
  * def init_proj_data():             # <<<<<<<<<<<<<<
  *     """Set Proj search directories in the following precedence:
  *     - wheel copy of proj_data
  */
-  __pyx_codeobj__31 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__29, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_init_proj_data, 227, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__31)) __PYX_ERR(0, 227, __pyx_L1_error)
+  __pyx_codeobj__31 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__29, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_init_proj_data, 238, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__31)) __PYX_ERR(0, 238, __pyx_L1_error)
 
-  /* "pyogrio/_ogr.pyx":260
+  /* "pyogrio/_ogr.pyx":278
  * 
  * 
  * def _register_drivers():             # <<<<<<<<<<<<<<
  *     # Register all drivers
  *     GDALAllRegister()
  */
-  __pyx_codeobj__32 = (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__ogr_pyx, __pyx_n_s_register_drivers, 260, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__32)) __PYX_ERR(0, 260, __pyx_L1_error)
+  __pyx_codeobj__32 = (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__ogr_pyx, __pyx_n_s_register_drivers, 278, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__32)) __PYX_ERR(0, 278, __pyx_L1_error)
 
-  /* "pyogrio/_ogr.pyx":265
+  /* "pyogrio/_ogr.pyx":283
  * 
  * 
  * def _get_driver_metadata_item(driver, metadata_item):             # <<<<<<<<<<<<<<
  *     """
  *     Query driver metadata items.
  */
-  __pyx_tuple__33 = PyTuple_Pack(6, __pyx_n_s_driver, __pyx_n_s_metadata_item, __pyx_n_s_metadata_c, __pyx_n_s_cogr_driver, __pyx_n_s_exc, __pyx_n_s_metadata); if (unlikely(!__pyx_tuple__33)) __PYX_ERR(0, 265, __pyx_L1_error)
+  __pyx_tuple__33 = PyTuple_Pack(6, __pyx_n_s_driver, __pyx_n_s_metadata_item, __pyx_n_s_metadata_c, __pyx_n_s_cogr_driver, __pyx_n_s_exc, __pyx_n_s_metadata); if (unlikely(!__pyx_tuple__33)) __PYX_ERR(0, 283, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__33);
   __Pyx_GIVEREF(__pyx_tuple__33);
-  __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__33, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_get_driver_metadata_item, 265, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) __PYX_ERR(0, 265, __pyx_L1_error)
+  __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__33, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_get_driver_metadata_item, 283, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) __PYX_ERR(0, 283, __pyx_L1_error)
 
-  /* "pyogrio/_ogr.pyx":306
+  /* "pyogrio/_ogr.pyx":324
  * 
  * 
  * def _get_drivers_for_path(path):             # <<<<<<<<<<<<<<
  *     cdef OGRSFDriverH driver = NULL
  *     cdef int i
  */
-  __pyx_tuple__35 = PyTuple_Pack(10, __pyx_n_s_path, __pyx_n_s_driver, __pyx_n_s_i, __pyx_n_s_name_c, __pyx_n_s_parts, __pyx_n_s_ext, __pyx_n_s_drivers, __pyx_n_s_name, __pyx_n_s_extensions, __pyx_n_s_prefix); if (unlikely(!__pyx_tuple__35)) __PYX_ERR(0, 306, __pyx_L1_error)
+  __pyx_tuple__35 = PyTuple_Pack(10, __pyx_n_s_path, __pyx_n_s_driver, __pyx_n_s_i, __pyx_n_s_name_c, __pyx_n_s_parts, __pyx_n_s_ext, __pyx_n_s_drivers, __pyx_n_s_name, __pyx_n_s_extensions, __pyx_n_s_prefix); if (unlikely(!__pyx_tuple__35)) __PYX_ERR(0, 324, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__35);
   __Pyx_GIVEREF(__pyx_tuple__35);
-  __pyx_codeobj__36 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__35, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_get_drivers_for_path, 306, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__36)) __PYX_ERR(0, 306, __pyx_L1_error)
+  __pyx_codeobj__36 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__35, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyogrio__ogr_pyx, __pyx_n_s_get_drivers_for_path, 324, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__36)) __PYX_ERR(0, 324, __pyx_L1_error)
   __Pyx_RefNannyFinishContext();
   return 0;
   __pyx_L1_error:;
@@ -8845,10 +8819,23 @@ static int __Pyx_modinit_type_init_code(void) {
 
 static int __Pyx_modinit_type_import_code(void) {
   __Pyx_RefNannyDeclarations
+  PyObject *__pyx_t_1 = NULL;
+  int __pyx_lineno = 0;
+  const char *__pyx_filename = NULL;
+  int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__Pyx_modinit_type_import_code", 0);
   /*--- Type import code ---*/
+  __pyx_t_1 = PyImport_ImportModule("pyogrio._err"); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_ptype_7pyogrio_4_err_ErrorHandler = __Pyx_ImportType_3_0_12(__pyx_t_1, "pyogrio._err", "ErrorHandler", sizeof(struct __pyx_obj_7pyogrio_4_err_ErrorHandler), __PYX_GET_STRUCT_ALIGNMENT_3_0_12(struct __pyx_obj_7pyogrio_4_err_ErrorHandler),__Pyx_ImportType_CheckSize_Warn_3_0_12); if (!__pyx_ptype_7pyogrio_4_err_ErrorHandler) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_vtabptr_7pyogrio_4_err_ErrorHandler = (struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler*)__Pyx_GetVtable(__pyx_ptype_7pyogrio_4_err_ErrorHandler); if (unlikely(!__pyx_vtabptr_7pyogrio_4_err_ErrorHandler)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
+  __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_t_1);
+  __Pyx_RefNannyFinishContext();
+  return -1;
 }
 
 static int __Pyx_modinit_variable_import_code(void) {
@@ -8869,9 +8856,7 @@ static int __Pyx_modinit_function_import_code(void) {
   /*--- Function import code ---*/
   __pyx_t_1 = PyImport_ImportModule("pyogrio._err"); if (!__pyx_t_1) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  if (__Pyx_ImportFunction_3_0_11(__pyx_t_1, "exc_wrap_int", (void (**)(void))&__pyx_f_7pyogrio_4_err_exc_wrap_int, "int (int)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
-  if (__Pyx_ImportFunction_3_0_11(__pyx_t_1, "exc_wrap_ogrerr", (void (**)(void))&__pyx_f_7pyogrio_4_err_exc_wrap_ogrerr, "int (int)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
-  if (__Pyx_ImportFunction_3_0_11(__pyx_t_1, "exc_wrap_pointer", (void (**)(void))&__pyx_f_7pyogrio_4_err_exc_wrap_pointer, "void *(void *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
+  if (__Pyx_ImportFunction_3_0_12(__pyx_t_1, "check_pointer", (void (**)(void))&__pyx_f_7pyogrio_4_err_check_pointer, "void *(void *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
@@ -9152,7 +9137,7 @@ if (!__Pyx_RefNanny) {
   (void)__Pyx_modinit_variable_export_code();
   if (unlikely((__Pyx_modinit_function_export_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   (void)__Pyx_modinit_type_init_code();
-  (void)__Pyx_modinit_type_import_code();
+  if (unlikely((__Pyx_modinit_type_import_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   (void)__Pyx_modinit_variable_import_code();
   if (unlikely((__Pyx_modinit_function_import_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   /*--- Execution code ---*/
@@ -9207,7 +9192,7 @@ if (!__Pyx_RefNanny) {
  * from uuid import uuid4
  * import warnings             # <<<<<<<<<<<<<<
  * 
- * from pyogrio._err cimport exc_wrap_int, exc_wrap_ogrerr, exc_wrap_pointer
+ * from pyogrio._err cimport check_pointer
  */
   __pyx_t_3 = __Pyx_ImportDottedModule(__pyx_n_s_warnings, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 4, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -9216,7 +9201,7 @@ if (!__Pyx_RefNanny) {
 
   /* "pyogrio/_ogr.pyx":7
  * 
- * from pyogrio._err cimport exc_wrap_int, exc_wrap_ogrerr, exc_wrap_pointer
+ * from pyogrio._err cimport check_pointer
  * from pyogrio._err import CPLE_BaseError, NullPointerError             # <<<<<<<<<<<<<<
  * from pyogrio.errors import DataSourceError
  * 
@@ -9243,7 +9228,7 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
   /* "pyogrio/_ogr.pyx":8
- * from pyogrio._err cimport exc_wrap_int, exc_wrap_ogrerr, exc_wrap_pointer
+ * from pyogrio._err cimport check_pointer
  * from pyogrio._err import CPLE_BaseError, NullPointerError
  * from pyogrio.errors import DataSourceError             # <<<<<<<<<<<<<<
  * 
@@ -9304,7 +9289,7 @@ if (!__Pyx_RefNanny) {
  * 
  * def set_gdal_config_options(dict options):             # <<<<<<<<<<<<<<
  *     for name, value in options.items():
- *         name_b = name.encode('utf-8')
+ *         name_b = name.encode("utf-8")
  */
   __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_7set_gdal_config_options, 0, __pyx_n_s_set_gdal_config_options, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__16)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 62, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -9315,7 +9300,7 @@ if (!__Pyx_RefNanny) {
  * 
  * 
  * def get_gdal_config_option(str name):             # <<<<<<<<<<<<<<
- *     name_b = name.encode('utf-8')
+ *     name_b = name.encode("utf-8")
  *     name_c = name_b
  */
   __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_9get_gdal_config_option, 0, __pyx_n_s_get_gdal_config_option, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__18)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 82, __pyx_L1_error)
@@ -9328,7 +9313,7 @@ if (!__Pyx_RefNanny) {
  * 
  * def ogr_driver_supports_write(driver):             # <<<<<<<<<<<<<<
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_CREATE") == "YES":
  */
   __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_11ogr_driver_supports_write, 0, __pyx_n_s_ogr_driver_supports_write, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__20)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -9340,7 +9325,7 @@ if (!__Pyx_RefNanny) {
  * 
  * def ogr_driver_supports_vsi(driver):             # <<<<<<<<<<<<<<
  *     # check metadata for driver to see if it supports write
- *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == 'YES':
+ *     if _get_driver_metadata_item(driver, "DCAP_VIRTUALIO") == "YES":
  */
   __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_13ogr_driver_supports_vsi, 0, __pyx_n_s_ogr_driver_supports_vsi, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__21)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 111, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -9399,60 +9384,60 @@ if (!__Pyx_RefNanny) {
  * 
  * 
  * def init_gdal_data():             # <<<<<<<<<<<<<<
- *     """Set GDAL data search directories in the following precedence:
- *     - wheel copy of gdal_data
+ *     """Set GDAL data search directories.
+ * 
  */
   __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_23init_gdal_data, 0, __pyx_n_s_init_gdal_data, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__30)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 196, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_init_gdal_data, __pyx_t_3) < 0) __PYX_ERR(0, 196, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "pyogrio/_ogr.pyx":227
+  /* "pyogrio/_ogr.pyx":238
  * 
  * 
  * def init_proj_data():             # <<<<<<<<<<<<<<
  *     """Set Proj search directories in the following precedence:
  *     - wheel copy of proj_data
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_25init_proj_data, 0, __pyx_n_s_init_proj_data, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__31)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 227, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_25init_proj_data, 0, __pyx_n_s_init_proj_data, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__31)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 238, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_init_proj_data, __pyx_t_3) < 0) __PYX_ERR(0, 227, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_init_proj_data, __pyx_t_3) < 0) __PYX_ERR(0, 238, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "pyogrio/_ogr.pyx":260
+  /* "pyogrio/_ogr.pyx":278
  * 
  * 
  * def _register_drivers():             # <<<<<<<<<<<<<<
  *     # Register all drivers
  *     GDALAllRegister()
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_27_register_drivers, 0, __pyx_n_s_register_drivers, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__32)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 260, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_27_register_drivers, 0, __pyx_n_s_register_drivers, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__32)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 278, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_register_drivers, __pyx_t_3) < 0) __PYX_ERR(0, 260, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_register_drivers, __pyx_t_3) < 0) __PYX_ERR(0, 278, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "pyogrio/_ogr.pyx":265
+  /* "pyogrio/_ogr.pyx":283
  * 
  * 
  * def _get_driver_metadata_item(driver, metadata_item):             # <<<<<<<<<<<<<<
  *     """
  *     Query driver metadata items.
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_29_get_driver_metadata_item, 0, __pyx_n_s_get_driver_metadata_item, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__34)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 265, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_29_get_driver_metadata_item, 0, __pyx_n_s_get_driver_metadata_item, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__34)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 283, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_get_driver_metadata_item, __pyx_t_3) < 0) __PYX_ERR(0, 265, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_get_driver_metadata_item, __pyx_t_3) < 0) __PYX_ERR(0, 283, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "pyogrio/_ogr.pyx":306
+  /* "pyogrio/_ogr.pyx":324
  * 
  * 
  * def _get_drivers_for_path(path):             # <<<<<<<<<<<<<<
  *     cdef OGRSFDriverH driver = NULL
  *     cdef int i
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_31_get_drivers_for_path, 0, __pyx_n_s_get_drivers_for_path, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__36)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 306, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_7pyogrio_4_ogr_31_get_drivers_for_path, 0, __pyx_n_s_get_drivers_for_path, NULL, __pyx_n_s_pyogrio__ogr, __pyx_d, ((PyObject *)__pyx_codeobj__36)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 324, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_get_drivers_for_path, __pyx_t_3) < 0) __PYX_ERR(0, 306, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_get_drivers_for_path, __pyx_t_3) < 0) __PYX_ERR(0, 324, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_ogr.pyx":1
@@ -11096,414 +11081,67 @@ static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name)
     return __Pyx_GetBuiltinName(name);
 }
 
-/* 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;
+/* RaiseException */
+#if PY_MAJOR_VERSION < 3
+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause) {
+    __Pyx_PyThreadState_declare
+    CYTHON_UNUSED_VAR(cause);
+    Py_XINCREF(type);
+    if (!value || value == Py_None)
+        value = NULL;
+    else
+        Py_INCREF(value);
+    if (!tb || tb == Py_None)
+        tb = NULL;
+    else {
+        Py_INCREF(tb);
+        if (!PyTraceBack_Check(tb)) {
+            PyErr_SetString(PyExc_TypeError,
+                "raise: arg 3 must be a traceback or None");
+            goto raise_error;
+        }
     }
-    return exc_info;
-}
+    if (PyType_Check(type)) {
+#if CYTHON_COMPILING_IN_PYPY
+        if (!value) {
+            Py_INCREF(Py_None);
+            value = Py_None;
+        }
 #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;
+        PyErr_NormalizeException(&type, &value, &tb);
     } 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
-
-/* FastTypeChecks */
-#if CYTHON_COMPILING_IN_CPYTHON
-static int __Pyx_InBases(PyTypeObject *a, PyTypeObject *b) {
-    while (a) {
-        a = __Pyx_PyType_GetSlot(a, tp_base, PyTypeObject*);
-        if (a == b)
-            return 1;
-    }
-    return b == &PyBaseObject_Type;
-}
-static CYTHON_INLINE int __Pyx_IsSubtype(PyTypeObject *a, PyTypeObject *b) {
-    PyObject *mro;
-    if (a == b) return 1;
-    mro = a->tp_mro;
-    if (likely(mro)) {
-        Py_ssize_t i, n;
-        n = PyTuple_GET_SIZE(mro);
-        for (i = 0; i < n; i++) {
-            if (PyTuple_GET_ITEM(mro, i) == (PyObject *)b)
-                return 1;
+        if (value) {
+            PyErr_SetString(PyExc_TypeError,
+                "instance exception may not have a separate value");
+            goto raise_error;
         }
-        return 0;
-    }
-    return __Pyx_InBases(a, b);
-}
-static CYTHON_INLINE int __Pyx_IsAnySubtype2(PyTypeObject *cls, PyTypeObject *a, PyTypeObject *b) {
-    PyObject *mro;
-    if (cls == a || cls == b) return 1;
-    mro = cls->tp_mro;
-    if (likely(mro)) {
-        Py_ssize_t i, n;
-        n = PyTuple_GET_SIZE(mro);
-        for (i = 0; i < n; i++) {
-            PyObject *base = PyTuple_GET_ITEM(mro, i);
-            if (base == (PyObject *)a || base == (PyObject *)b)
-                return 1;
+        value = type;
+        type = (PyObject*) Py_TYPE(type);
+        Py_INCREF(type);
+        if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) {
+            PyErr_SetString(PyExc_TypeError,
+                "raise: exception class must be a subclass of BaseException");
+            goto raise_error;
         }
-        return 0;
     }
-    return __Pyx_InBases(cls, a) || __Pyx_InBases(cls, b);
-}
-#if PY_MAJOR_VERSION == 2
-static int __Pyx_inner_PyErr_GivenExceptionMatches2(PyObject *err, PyObject* exc_type1, PyObject* exc_type2) {
-    PyObject *exception, *value, *tb;
-    int res;
-    __Pyx_PyThreadState_declare
     __Pyx_PyThreadState_assign
-    __Pyx_ErrFetch(&exception, &value, &tb);
-    res = exc_type1 ? PyObject_IsSubclass(err, exc_type1) : 0;
-    if (unlikely(res == -1)) {
-        PyErr_WriteUnraisable(err);
-        res = 0;
-    }
-    if (!res) {
-        res = PyObject_IsSubclass(err, exc_type2);
-        if (unlikely(res == -1)) {
-            PyErr_WriteUnraisable(err);
-            res = 0;
-        }
-    }
-    __Pyx_ErrRestore(exception, value, tb);
-    return res;
+    __Pyx_ErrRestore(type, value, tb);
+    return;
+raise_error:
+    Py_XDECREF(value);
+    Py_XDECREF(type);
+    Py_XDECREF(tb);
+    return;
 }
 #else
-static CYTHON_INLINE int __Pyx_inner_PyErr_GivenExceptionMatches2(PyObject *err, PyObject* exc_type1, PyObject *exc_type2) {
-    if (exc_type1) {
-        return __Pyx_IsAnySubtype2((PyTypeObject*)err, (PyTypeObject*)exc_type1, (PyTypeObject*)exc_type2);
-    } else {
-        return __Pyx_IsSubtype((PyTypeObject*)err, (PyTypeObject*)exc_type2);
-    }
-}
-#endif
-static int __Pyx_PyErr_GivenExceptionMatchesTuple(PyObject *exc_type, PyObject *tuple) {
-    Py_ssize_t i, n;
-    assert(PyExceptionClass_Check(exc_type));
-    n = PyTuple_GET_SIZE(tuple);
-#if PY_MAJOR_VERSION >= 3
-    for (i=0; i<n; i++) {
-        if (exc_type == PyTuple_GET_ITEM(tuple, i)) return 1;
-    }
-#endif
-    for (i=0; i<n; i++) {
-        PyObject *t = PyTuple_GET_ITEM(tuple, i);
-        #if PY_MAJOR_VERSION < 3
-        if (likely(exc_type == t)) return 1;
-        #endif
-        if (likely(PyExceptionClass_Check(t))) {
-            if (__Pyx_inner_PyErr_GivenExceptionMatches2(exc_type, NULL, t)) return 1;
-        } else {
-        }
-    }
-    return 0;
-}
-static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches(PyObject *err, PyObject* exc_type) {
-    if (likely(err == exc_type)) return 1;
-    if (likely(PyExceptionClass_Check(err))) {
-        if (likely(PyExceptionClass_Check(exc_type))) {
-            return __Pyx_inner_PyErr_GivenExceptionMatches2(err, NULL, exc_type);
-        } else if (likely(PyTuple_Check(exc_type))) {
-            return __Pyx_PyErr_GivenExceptionMatchesTuple(err, exc_type);
-        } else {
-        }
-    }
-    return PyErr_GivenExceptionMatches(err, exc_type);
-}
-static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObject *exc_type1, PyObject *exc_type2) {
-    assert(PyExceptionClass_Check(exc_type1));
-    assert(PyExceptionClass_Check(exc_type2));
-    if (likely(err == exc_type1 || err == exc_type2)) return 1;
-    if (likely(PyExceptionClass_Check(err))) {
-        return __Pyx_inner_PyErr_GivenExceptionMatches2(err, exc_type1, exc_type2);
-    }
-    return (PyErr_GivenExceptionMatches(err, exc_type1) || PyErr_GivenExceptionMatches(err, exc_type2));
-}
-#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
-
-/* RaiseException */
-#if PY_MAJOR_VERSION < 3
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause) {
-    __Pyx_PyThreadState_declare
-    CYTHON_UNUSED_VAR(cause);
-    Py_XINCREF(type);
-    if (!value || value == Py_None)
-        value = NULL;
-    else
-        Py_INCREF(value);
-    if (!tb || tb == Py_None)
-        tb = NULL;
-    else {
-        Py_INCREF(tb);
-        if (!PyTraceBack_Check(tb)) {
-            PyErr_SetString(PyExc_TypeError,
-                "raise: arg 3 must be a traceback or None");
-            goto raise_error;
-        }
-    }
-    if (PyType_Check(type)) {
-#if CYTHON_COMPILING_IN_PYPY
-        if (!value) {
-            Py_INCREF(Py_None);
-            value = Py_None;
-        }
-#endif
-        PyErr_NormalizeException(&type, &value, &tb);
-    } else {
-        if (value) {
-            PyErr_SetString(PyExc_TypeError,
-                "instance exception may not have a separate value");
-            goto raise_error;
-        }
-        value = type;
-        type = (PyObject*) Py_TYPE(type);
-        Py_INCREF(type);
-        if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) {
-            PyErr_SetString(PyExc_TypeError,
-                "raise: exception class must be a subclass of BaseException");
-            goto raise_error;
-        }
-    }
-    __Pyx_PyThreadState_assign
-    __Pyx_ErrRestore(type, value, tb);
-    return;
-raise_error:
-    Py_XDECREF(value);
-    Py_XDECREF(type);
-    Py_XDECREF(tb);
-    return;
-}
-#else
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause) {
-    PyObject* owned_instance = NULL;
-    if (tb == Py_None) {
-        tb = 0;
-    } else if (tb && !PyTraceBack_Check(tb)) {
-        PyErr_SetString(PyExc_TypeError,
-            "raise: arg 3 must be a traceback or None");
-        goto bad;
+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause) {
+    PyObject* owned_instance = NULL;
+    if (tb == Py_None) {
+        tb = 0;
+    } else if (tb && !PyTraceBack_Check(tb)) {
+        PyErr_SetString(PyExc_TypeError,
+            "raise: arg 3 must be a traceback or None");
+        goto bad;
     }
     if (value == Py_None)
         value = 0;
@@ -11598,91 +11236,438 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject
         Py_XDECREF(tmp_tb);
 #endif
     }
-bad:
-    Py_XDECREF(owned_instance);
-    return;
+bad:
+    Py_XDECREF(owned_instance);
+    return;
+}
+#endif
+
+/* JoinPyUnicode */
+static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_count, Py_ssize_t result_ulength,
+                                      Py_UCS4 max_char) {
+#if CYTHON_USE_UNICODE_INTERNALS && CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
+    PyObject *result_uval;
+    int result_ukind, kind_shift;
+    Py_ssize_t i, char_pos;
+    void *result_udata;
+    CYTHON_MAYBE_UNUSED_VAR(max_char);
+#if CYTHON_PEP393_ENABLED
+    result_uval = PyUnicode_New(result_ulength, max_char);
+    if (unlikely(!result_uval)) return NULL;
+    result_ukind = (max_char <= 255) ? PyUnicode_1BYTE_KIND : (max_char <= 65535) ? PyUnicode_2BYTE_KIND : PyUnicode_4BYTE_KIND;
+    kind_shift = (result_ukind == PyUnicode_4BYTE_KIND) ? 2 : result_ukind - 1;
+    result_udata = PyUnicode_DATA(result_uval);
+#else
+    result_uval = PyUnicode_FromUnicode(NULL, result_ulength);
+    if (unlikely(!result_uval)) return NULL;
+    result_ukind = sizeof(Py_UNICODE);
+    kind_shift = (result_ukind == 4) ? 2 : result_ukind - 1;
+    result_udata = PyUnicode_AS_UNICODE(result_uval);
+#endif
+    assert(kind_shift == 2 || kind_shift == 1 || kind_shift == 0);
+    char_pos = 0;
+    for (i=0; i < value_count; i++) {
+        int ukind;
+        Py_ssize_t ulength;
+        void *udata;
+        PyObject *uval = PyTuple_GET_ITEM(value_tuple, i);
+        if (unlikely(__Pyx_PyUnicode_READY(uval)))
+            goto bad;
+        ulength = __Pyx_PyUnicode_GET_LENGTH(uval);
+        if (unlikely(!ulength))
+            continue;
+        if (unlikely((PY_SSIZE_T_MAX >> kind_shift) - ulength < char_pos))
+            goto overflow;
+        ukind = __Pyx_PyUnicode_KIND(uval);
+        udata = __Pyx_PyUnicode_DATA(uval);
+        if (!CYTHON_PEP393_ENABLED || ukind == result_ukind) {
+            memcpy((char *)result_udata + (char_pos << kind_shift), udata, (size_t) (ulength << kind_shift));
+        } else {
+            #if PY_VERSION_HEX >= 0x030d0000
+            if (unlikely(PyUnicode_CopyCharacters(result_uval, char_pos, uval, 0, ulength) < 0)) goto bad;
+            #elif CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030300F0 || defined(_PyUnicode_FastCopyCharacters)
+            _PyUnicode_FastCopyCharacters(result_uval, char_pos, uval, 0, ulength);
+            #else
+            Py_ssize_t j;
+            for (j=0; j < ulength; j++) {
+                Py_UCS4 uchar = __Pyx_PyUnicode_READ(ukind, udata, j);
+                __Pyx_PyUnicode_WRITE(result_ukind, result_udata, char_pos+j, uchar);
+            }
+            #endif
+        }
+        char_pos += ulength;
+    }
+    return result_uval;
+overflow:
+    PyErr_SetString(PyExc_OverflowError, "join() result is too long for a Python string");
+bad:
+    Py_DECREF(result_uval);
+    return NULL;
+#else
+    CYTHON_UNUSED_VAR(max_char);
+    CYTHON_UNUSED_VAR(result_ulength);
+    CYTHON_UNUSED_VAR(value_count);
+    return PyUnicode_Join(__pyx_empty_unicode, value_tuple);
+#endif
+}
+
+/* RaiseUnexpectedTypeError */
+static int
+__Pyx_RaiseUnexpectedTypeError(const char *expected, PyObject *obj)
+{
+    __Pyx_TypeName obj_type_name = __Pyx_PyType_GetName(Py_TYPE(obj));
+    PyErr_Format(PyExc_TypeError, "Expected %s, got " __Pyx_FMT_TYPENAME,
+                 expected, obj_type_name);
+    __Pyx_DECREF_TypeName(obj_type_name);
+    return 0;
+}
+
+/* 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
+
+/* FastTypeChecks */
+#if CYTHON_COMPILING_IN_CPYTHON
+static int __Pyx_InBases(PyTypeObject *a, PyTypeObject *b) {
+    while (a) {
+        a = __Pyx_PyType_GetSlot(a, tp_base, PyTypeObject*);
+        if (a == b)
+            return 1;
+    }
+    return b == &PyBaseObject_Type;
+}
+static CYTHON_INLINE int __Pyx_IsSubtype(PyTypeObject *a, PyTypeObject *b) {
+    PyObject *mro;
+    if (a == b) return 1;
+    mro = a->tp_mro;
+    if (likely(mro)) {
+        Py_ssize_t i, n;
+        n = PyTuple_GET_SIZE(mro);
+        for (i = 0; i < n; i++) {
+            if (PyTuple_GET_ITEM(mro, i) == (PyObject *)b)
+                return 1;
+        }
+        return 0;
+    }
+    return __Pyx_InBases(a, b);
+}
+static CYTHON_INLINE int __Pyx_IsAnySubtype2(PyTypeObject *cls, PyTypeObject *a, PyTypeObject *b) {
+    PyObject *mro;
+    if (cls == a || cls == b) return 1;
+    mro = cls->tp_mro;
+    if (likely(mro)) {
+        Py_ssize_t i, n;
+        n = PyTuple_GET_SIZE(mro);
+        for (i = 0; i < n; i++) {
+            PyObject *base = PyTuple_GET_ITEM(mro, i);
+            if (base == (PyObject *)a || base == (PyObject *)b)
+                return 1;
+        }
+        return 0;
+    }
+    return __Pyx_InBases(cls, a) || __Pyx_InBases(cls, b);
+}
+#if PY_MAJOR_VERSION == 2
+static int __Pyx_inner_PyErr_GivenExceptionMatches2(PyObject *err, PyObject* exc_type1, PyObject* exc_type2) {
+    PyObject *exception, *value, *tb;
+    int res;
+    __Pyx_PyThreadState_declare
+    __Pyx_PyThreadState_assign
+    __Pyx_ErrFetch(&exception, &value, &tb);
+    res = exc_type1 ? PyObject_IsSubclass(err, exc_type1) : 0;
+    if (unlikely(res == -1)) {
+        PyErr_WriteUnraisable(err);
+        res = 0;
+    }
+    if (!res) {
+        res = PyObject_IsSubclass(err, exc_type2);
+        if (unlikely(res == -1)) {
+            PyErr_WriteUnraisable(err);
+            res = 0;
+        }
+    }
+    __Pyx_ErrRestore(exception, value, tb);
+    return res;
+}
+#else
+static CYTHON_INLINE int __Pyx_inner_PyErr_GivenExceptionMatches2(PyObject *err, PyObject* exc_type1, PyObject *exc_type2) {
+    if (exc_type1) {
+        return __Pyx_IsAnySubtype2((PyTypeObject*)err, (PyTypeObject*)exc_type1, (PyTypeObject*)exc_type2);
+    } else {
+        return __Pyx_IsSubtype((PyTypeObject*)err, (PyTypeObject*)exc_type2);
+    }
+}
+#endif
+static int __Pyx_PyErr_GivenExceptionMatchesTuple(PyObject *exc_type, PyObject *tuple) {
+    Py_ssize_t i, n;
+    assert(PyExceptionClass_Check(exc_type));
+    n = PyTuple_GET_SIZE(tuple);
+#if PY_MAJOR_VERSION >= 3
+    for (i=0; i<n; i++) {
+        if (exc_type == PyTuple_GET_ITEM(tuple, i)) return 1;
+    }
+#endif
+    for (i=0; i<n; i++) {
+        PyObject *t = PyTuple_GET_ITEM(tuple, i);
+        #if PY_MAJOR_VERSION < 3
+        if (likely(exc_type == t)) return 1;
+        #endif
+        if (likely(PyExceptionClass_Check(t))) {
+            if (__Pyx_inner_PyErr_GivenExceptionMatches2(exc_type, NULL, t)) return 1;
+        } else {
+        }
+    }
+    return 0;
+}
+static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches(PyObject *err, PyObject* exc_type) {
+    if (likely(err == exc_type)) return 1;
+    if (likely(PyExceptionClass_Check(err))) {
+        if (likely(PyExceptionClass_Check(exc_type))) {
+            return __Pyx_inner_PyErr_GivenExceptionMatches2(err, NULL, exc_type);
+        } else if (likely(PyTuple_Check(exc_type))) {
+            return __Pyx_PyErr_GivenExceptionMatchesTuple(err, exc_type);
+        } else {
+        }
+    }
+    return PyErr_GivenExceptionMatches(err, exc_type);
+}
+static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObject *exc_type1, PyObject *exc_type2) {
+    assert(PyExceptionClass_Check(exc_type1));
+    assert(PyExceptionClass_Check(exc_type2));
+    if (likely(err == exc_type1 || err == exc_type2)) return 1;
+    if (likely(PyExceptionClass_Check(err))) {
+        return __Pyx_inner_PyErr_GivenExceptionMatches2(err, exc_type1, exc_type2);
+    }
+    return (PyErr_GivenExceptionMatches(err, exc_type1) || PyErr_GivenExceptionMatches(err, exc_type2));
 }
 #endif
 
-/* JoinPyUnicode */
-static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_count, Py_ssize_t result_ulength,
-                                      Py_UCS4 max_char) {
-#if CYTHON_USE_UNICODE_INTERNALS && CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-    PyObject *result_uval;
-    int result_ukind, kind_shift;
-    Py_ssize_t i, char_pos;
-    void *result_udata;
-    CYTHON_MAYBE_UNUSED_VAR(max_char);
-#if CYTHON_PEP393_ENABLED
-    result_uval = PyUnicode_New(result_ulength, max_char);
-    if (unlikely(!result_uval)) return NULL;
-    result_ukind = (max_char <= 255) ? PyUnicode_1BYTE_KIND : (max_char <= 65535) ? PyUnicode_2BYTE_KIND : PyUnicode_4BYTE_KIND;
-    kind_shift = (result_ukind == PyUnicode_4BYTE_KIND) ? 2 : result_ukind - 1;
-    result_udata = PyUnicode_DATA(result_uval);
+/* GetException */
+#if CYTHON_FAST_THREAD_STATE
+static int __Pyx__GetException(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb)
 #else
-    result_uval = PyUnicode_FromUnicode(NULL, result_ulength);
-    if (unlikely(!result_uval)) return NULL;
-    result_ukind = sizeof(Py_UNICODE);
-    kind_shift = (result_ukind == 4) ? 2 : result_ukind - 1;
-    result_udata = PyUnicode_AS_UNICODE(result_uval);
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb)
 #endif
-    assert(kind_shift == 2 || kind_shift == 1 || kind_shift == 0);
-    char_pos = 0;
-    for (i=0; i < value_count; i++) {
-        int ukind;
-        Py_ssize_t ulength;
-        void *udata;
-        PyObject *uval = PyTuple_GET_ITEM(value_tuple, i);
-        if (unlikely(__Pyx_PyUnicode_READY(uval)))
+{
+    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;
-        ulength = __Pyx_PyUnicode_GET_LENGTH(uval);
-        if (unlikely(!ulength))
-            continue;
-        if (unlikely((PY_SSIZE_T_MAX >> kind_shift) - ulength < char_pos))
-            goto overflow;
-        ukind = __Pyx_PyUnicode_KIND(uval);
-        udata = __Pyx_PyUnicode_DATA(uval);
-        if (!CYTHON_PEP393_ENABLED || ukind == result_ukind) {
-            memcpy((char *)result_udata + (char_pos << kind_shift), udata, (size_t) (ulength << kind_shift));
-        } else {
-            #if PY_VERSION_HEX >= 0x030d0000
-            if (unlikely(PyUnicode_CopyCharacters(result_uval, char_pos, uval, 0, ulength) < 0)) goto bad;
-            #elif CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030300F0 || defined(_PyUnicode_FastCopyCharacters)
-            _PyUnicode_FastCopyCharacters(result_uval, char_pos, uval, 0, ulength);
-            #else
-            Py_ssize_t j;
-            for (j=0; j < ulength; j++) {
-                Py_UCS4 uchar = __Pyx_PyUnicode_READ(ukind, udata, j);
-                __Pyx_PyUnicode_WRITE(result_ukind, result_udata, char_pos+j, uchar);
-            }
-            #endif
-        }
-        char_pos += ulength;
     }
-    return result_uval;
-overflow:
-    PyErr_SetString(PyExc_OverflowError, "join() result is too long for a Python string");
-bad:
-    Py_DECREF(result_uval);
-    return NULL;
+    #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
-    CYTHON_UNUSED_VAR(max_char);
-    CYTHON_UNUSED_VAR(result_ulength);
-    CYTHON_UNUSED_VAR(value_count);
-    return PyUnicode_Join(__pyx_empty_unicode, value_tuple);
+    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;
 }
 
-/* RaiseUnexpectedTypeError */
-static int
-__Pyx_RaiseUnexpectedTypeError(const char *expected, PyObject *obj)
-{
-    __Pyx_TypeName obj_type_name = __Pyx_PyType_GetName(Py_TYPE(obj));
-    PyErr_Format(PyExc_TypeError, "Expected %s, got " __Pyx_FMT_TYPENAME,
-                 expected, obj_type_name);
-    __Pyx_DECREF_TypeName(obj_type_name);
-    return 0;
+/* 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
 
 /* GetItemInt */
 static PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
@@ -11883,6 +11868,106 @@ bad:
     return NULL;
 }
 
+/* TypeImport */
+#ifndef __PYX_HAVE_RT_ImportType_3_0_12
+#define __PYX_HAVE_RT_ImportType_3_0_12
+static PyTypeObject *__Pyx_ImportType_3_0_12(PyObject *module, const char *module_name, const char *class_name,
+    size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_12 check_size)
+{
+    PyObject *result = 0;
+    char warning[200];
+    Py_ssize_t basicsize;
+    Py_ssize_t itemsize;
+#if CYTHON_COMPILING_IN_LIMITED_API
+    PyObject *py_basicsize;
+    PyObject *py_itemsize;
+#endif
+    result = PyObject_GetAttrString(module, class_name);
+    if (!result)
+        goto bad;
+    if (!PyType_Check(result)) {
+        PyErr_Format(PyExc_TypeError,
+            "%.200s.%.200s is not a type object",
+            module_name, class_name);
+        goto bad;
+    }
+#if !CYTHON_COMPILING_IN_LIMITED_API
+    basicsize = ((PyTypeObject *)result)->tp_basicsize;
+    itemsize = ((PyTypeObject *)result)->tp_itemsize;
+#else
+    py_basicsize = PyObject_GetAttrString(result, "__basicsize__");
+    if (!py_basicsize)
+        goto bad;
+    basicsize = PyLong_AsSsize_t(py_basicsize);
+    Py_DECREF(py_basicsize);
+    py_basicsize = 0;
+    if (basicsize == (Py_ssize_t)-1 && PyErr_Occurred())
+        goto bad;
+    py_itemsize = PyObject_GetAttrString(result, "__itemsize__");
+    if (!py_itemsize)
+        goto bad;
+    itemsize = PyLong_AsSsize_t(py_itemsize);
+    Py_DECREF(py_itemsize);
+    py_itemsize = 0;
+    if (itemsize == (Py_ssize_t)-1 && PyErr_Occurred())
+        goto bad;
+#endif
+    if (itemsize) {
+        if (size % alignment) {
+            alignment = size % alignment;
+        }
+        if (itemsize < (Py_ssize_t)alignment)
+            itemsize = (Py_ssize_t)alignment;
+    }
+    if ((size_t)(basicsize + itemsize) < size) {
+        PyErr_Format(PyExc_ValueError,
+            "%.200s.%.200s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd from PyObject",
+            module_name, class_name, size, basicsize+itemsize);
+        goto bad;
+    }
+    if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_12 &&
+            ((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) {
+        PyErr_Format(PyExc_ValueError,
+            "%.200s.%.200s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd-%zd from PyObject",
+            module_name, class_name, size, basicsize, basicsize+itemsize);
+        goto bad;
+    }
+    else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_12 && (size_t)basicsize > size) {
+        PyOS_snprintf(warning, sizeof(warning),
+            "%s.%s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd from PyObject",
+            module_name, class_name, size, basicsize);
+        if (PyErr_WarnEx(NULL, warning, 0) < 0) goto bad;
+    }
+    return (PyTypeObject *)result;
+bad:
+    Py_XDECREF(result);
+    return NULL;
+}
+#endif
+
+/* GetVTable */
+static void* __Pyx_GetVtable(PyTypeObject *type) {
+    void* ptr;
+#if CYTHON_COMPILING_IN_LIMITED_API
+    PyObject *ob = PyObject_GetAttr((PyObject *)type, __pyx_n_s_pyx_vtable);
+#else
+    PyObject *ob = PyObject_GetItem(type->tp_dict, __pyx_n_s_pyx_vtable);
+#endif
+    if (!ob)
+        goto bad;
+    ptr = PyCapsule_GetPointer(ob, 0);
+    if (!ptr && !PyErr_Occurred())
+        PyErr_SetString(PyExc_RuntimeError, "invalid vtable found for imported type");
+    Py_DECREF(ob);
+    return ptr;
+bad:
+    Py_XDECREF(ob);
+    return NULL;
+}
+
 /* Import */
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level) {
     PyObject *module = 0;
@@ -13494,7 +13579,7 @@ static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) {
 #include "compile.h"
 #include "frameobject.h"
 #include "traceback.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
+#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif
@@ -14477,9 +14562,9 @@ bad:
 }
 
 /* FunctionImport */
-#ifndef __PYX_HAVE_RT_ImportFunction_3_0_11
-#define __PYX_HAVE_RT_ImportFunction_3_0_11
-static int __Pyx_ImportFunction_3_0_11(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
+#ifndef __PYX_HAVE_RT_ImportFunction_3_0_12
+#define __PYX_HAVE_RT_ImportFunction_3_0_12
+static int __Pyx_ImportFunction_3_0_12(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
     PyObject *d = 0;
     PyObject *cobj = 0;
     union {