MAINT: enable cython-lint + fix errors

.pre-commit-config.yaml

@@ -1,7 +1,11 @@
-files: 'pyogrio\/'
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: "v0.5.2"
     hooks:
       - id: ruff-format
-      - id: ruff
+      - id: ruff
+  - repo: https://github.com/MarcoGorelli/cython-lint
+    rev: v0.16.6
+    hooks:
+      - id: cython-lint
+      - id: double-quote-cython-strings

pyogrio/_err.pyx

@@ -9,8 +9,8 @@ from contextvars import ContextVar
 from itertools import zip_longest
 
 from pyogrio._ogr cimport (
-    CE_None, CE_Debug, CE_Warning, CE_Failure, CE_Fatal, CPLErrorReset,
-    CPLGetLastErrorType, CPLGetLastErrorNo, CPLGetLastErrorMsg, OGRErr,
+    CE_Warning, CE_Failure, CE_Fatal, CPLErrorReset,
+    CPLGetLastErrorType, CPLGetLastErrorNo, CPLGetLastErrorMsg,
     OGRERR_NONE, CPLErr, CPLErrorHandler, CPLDefaultErrorHandler,
     CPLPopErrorHandler, CPLPushErrorHandler)
 
@@ -242,7 +242,9 @@ cdef int check_int(int err) except -1:
     return err
 
 
-cdef void error_handler(CPLErr err_class, int err_no, const char* err_msg) noexcept nogil:
+cdef void error_handler(
+    CPLErr err_class, int err_no, const char* err_msg
+) noexcept nogil:
     """Custom CPL error handler to match the Python behaviour.
 
     For non-fatal errors (CE_Failure), error printing to stderr (behaviour of
@@ -345,7 +347,7 @@ cdef class ErrorHandler:
                 raise NullPointerError(-1, -1, "NULL pointer error")
 
         return ptr
-    
+
     cdef void _handle_error_stack(self, bint squash_errors):
         """Handle the errors in `error_stack`."""
         stack = self.error_stack.get()

pyogrio/_geometry.pxd

@@ -1,4 +1,4 @@
 from pyogrio._ogr cimport *
 
 cdef str get_geometry_type(void *ogr_layer)
-cdef OGRwkbGeometryType get_geometry_type_code(str geometry_type) except *
+cdef OGRwkbGeometryType get_geometry_type_code(str geometry_type) except *

pyogrio/_geometry.pyx

@@ -8,63 +8,63 @@ from pyogrio.errors import DataLayerError, GeometryError
 # Mapping of OGR integer geometry types to GeoJSON type names.
 
 GEOMETRY_TYPES = {
-    wkbUnknown: 'Unknown',
-    wkbPoint: 'Point',
-    wkbLineString: 'LineString',
-    wkbPolygon: 'Polygon',
-    wkbMultiPoint: 'MultiPoint',
-    wkbMultiLineString: 'MultiLineString',
-    wkbMultiPolygon: 'MultiPolygon',
-    wkbGeometryCollection: 'GeometryCollection',
+    wkbUnknown: "Unknown",
+    wkbPoint: "Point",
+    wkbLineString: "LineString",
+    wkbPolygon: "Polygon",
+    wkbMultiPoint: "MultiPoint",
+    wkbMultiLineString: "MultiLineString",
+    wkbMultiPolygon: "MultiPolygon",
+    wkbGeometryCollection: "GeometryCollection",
     wkbNone: None,
-    wkbLinearRing: 'LinearRing',
+    wkbLinearRing: "LinearRing",
     # WARNING: Measured types are not supported in GEOS and downstream uses
     # these are stripped automatically to their corresponding 2D / 3D types
-    wkbPointM: 'PointM',
-    wkbLineStringM: 'Measured LineString',
-    wkbPolygonM: 'Measured Polygon',
-    wkbMultiPointM: 'Measured MultiPoint',
-    wkbMultiLineStringM: 'Measured MultiLineString',
-    wkbMultiPolygonM: 'Measured MultiPolygon',
-    wkbGeometryCollectionM: 'Measured GeometryCollection',
-    wkbPointZM: 'Measured 3D Point',
-    wkbLineStringZM: 'Measured 3D LineString',
-    wkbPolygonZM: 'Measured 3D Polygon',
-    wkbMultiPointZM: 'Measured 3D MultiPoint',
-    wkbMultiLineStringZM: 'Measured 3D MultiLineString',
-    wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
-    wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
-    wkbPoint25D: 'Point Z',
-    wkbLineString25D: 'LineString Z',
-    wkbPolygon25D: 'Polygon Z',
-    wkbMultiPoint25D: 'MultiPoint Z',
-    wkbMultiLineString25D: 'MultiLineString Z',
-    wkbMultiPolygon25D: 'MultiPolygon Z',
-    wkbGeometryCollection25D: 'GeometryCollection Z',
+    wkbPointM: "PointM",
+    wkbLineStringM: "Measured LineString",
+    wkbPolygonM: "Measured Polygon",
+    wkbMultiPointM: "Measured MultiPoint",
+    wkbMultiLineStringM: "Measured MultiLineString",
+    wkbMultiPolygonM: "Measured MultiPolygon",
+    wkbGeometryCollectionM: "Measured GeometryCollection",
+    wkbPointZM: "Measured 3D Point",
+    wkbLineStringZM: "Measured 3D LineString",
+    wkbPolygonZM: "Measured 3D Polygon",
+    wkbMultiPointZM: "Measured 3D MultiPoint",
+    wkbMultiLineStringZM: "Measured 3D MultiLineString",
+    wkbMultiPolygonZM: "Measured 3D MultiPolygon",
+    wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
+    wkbPoint25D: "Point Z",
+    wkbLineString25D: "LineString Z",
+    wkbPolygon25D: "Polygon Z",
+    wkbMultiPoint25D: "MultiPoint Z",
+    wkbMultiLineString25D: "MultiLineString Z",
+    wkbMultiPolygon25D: "MultiPolygon Z",
+    wkbGeometryCollection25D: "GeometryCollection Z",
 }
 
-GEOMETRY_TYPE_CODES = {v:k for k, v in GEOMETRY_TYPES.items()}
+GEOMETRY_TYPE_CODES = {v: k for k, v in GEOMETRY_TYPES.items()}
 
 # add additional aliases from 2.5D format
 GEOMETRY_TYPE_CODES.update({
-    '2.5D Point': wkbPoint25D,
-    '2.5D LineString': wkbLineString25D,
-    '2.5D Polygon': wkbPolygon25D,
-    '2.5D MultiPoint': wkbMultiPoint25D,
-    '2.5D MultiLineString': wkbMultiLineString25D,
-    '2.5D MultiPolygon': wkbMultiPolygon25D,
-    '2.5D GeometryCollection': wkbGeometryCollection25D
+    "2.5D Point": wkbPoint25D,
+    "2.5D LineString": wkbLineString25D,
+    "2.5D Polygon": wkbPolygon25D,
+    "2.5D MultiPoint": wkbMultiPoint25D,
+    "2.5D MultiLineString": wkbMultiLineString25D,
+    "2.5D MultiPolygon": wkbMultiPolygon25D,
+    "2.5D GeometryCollection": wkbGeometryCollection25D
 })
 
 # 2.5D also represented using negative numbers not enumerated above
 GEOMETRY_TYPES.update({
-    -2147483647: 'Point Z',
-    -2147483646: 'LineString Z',
-    -2147483645: 'Polygon Z',
-    -2147483644: 'MultiPoint Z',
-    -2147483643: 'MultiLineString Z',
-    -2147483642: 'MultiPolygon Z',
-    -2147483641: 'GeometryCollection Z',
+    -2147483647: "Point Z",
+    -2147483646: "LineString Z",
+    -2147483645: "Polygon Z",
+    -2147483644: "MultiPoint Z",
+    -2147483643: "MultiLineString Z",
+    -2147483642: "MultiPolygon Z",
+    -2147483641: "GeometryCollection Z",
 })
 
 
@@ -80,7 +80,7 @@ cdef str get_geometry_type(void *ogr_layer):
     str
         geometry type
     """
-    cdef void *cogr_featuredef = NULL
+    cdef void *ogr_featuredef = NULL
     cdef OGRwkbGeometryType ogr_type
 
     try:
@@ -126,4 +126,4 @@ cdef OGRwkbGeometryType get_geometry_type_code(str geometry_type) except *:
     if geometry_type not in GEOMETRY_TYPE_CODES:
         raise GeometryError(f"Geometry type is not supported: {geometry_type}")
 
-    return GEOMETRY_TYPE_CODES[geometry_type]
+    return GEOMETRY_TYPE_CODES[geometry_type]