Replace usage of deprecated functions with current ones.

Author: eseglem

geojson_pydantic/geo_interface.py

@@ -3,10 +3,10 @@
 from typing import Any, Dict, Protocol
 
 
-class _DictProtocol(Protocol):
+class _ModelDumpProtocol(Protocol):
     """Protocol for use as the type of self in the mixin."""
 
-    def dict(self, *, exclude_unset: bool, **args: Any) -> Dict[str, Any]:
+    def model_dump(self, *, exclude_unset: bool, **args: Any) -> Dict[str, Any]:
         """Define a dict function so the mixin knows it exists."""
         ...
 
@@ -15,9 +15,9 @@ class GeoInterfaceMixin:
     """Mixin for __geo_interface__ on GeoJSON objects."""
 
     @property
-    def __geo_interface__(self: _DictProtocol) -> Dict[str, Any]:
+    def __geo_interface__(self: _ModelDumpProtocol) -> Dict[str, Any]:
         """GeoJSON-like protocol for geo-spatial (GIS) vector data.
 
         ref: https://gist.github.com/sgillies/2217756#__geo_interface
         """
-        return self.dict(exclude_unset=True)
+        return self.model_dump(exclude_unset=True)

geojson_pydantic/geometries.py

@@ -321,21 +321,21 @@ def parse_geometry_obj(obj: Any) -> Geometry:
         raise ValueError("Missing 'type' field in geometry")
 
     if obj["type"] == "Point":
-        return Point.parse_obj(obj)
+        return Point.model_validate(obj)
 
     elif obj["type"] == "MultiPoint":
-        return MultiPoint.parse_obj(obj)
+        return MultiPoint.model_validate(obj)
 
     elif obj["type"] == "LineString":
-        return LineString.parse_obj(obj)
+        return LineString.model_validate(obj)
 
     elif obj["type"] == "MultiLineString":
-        return MultiLineString.parse_obj(obj)
+        return MultiLineString.model_validate(obj)
 
     elif obj["type"] == "Polygon":
-        return Polygon.parse_obj(obj)
+        return Polygon.model_validate(obj)
 
     elif obj["type"] == "MultiPolygon":
-        return MultiPolygon.parse_obj(obj)
+        return MultiPolygon.model_validate(obj)
 
     raise ValueError(f"Unknown type: {obj['type']}")

tests/test_features.py

@@ -174,7 +174,7 @@ class Pointy:
         __geo_interface__ = {"type": "Point", "coordinates": (0.0, 0.0)}
 
     feat = Feature(type="Feature", geometry=Pointy(), properties={})
-    assert feat.geometry.dict(exclude_unset=True) == Pointy.__geo_interface__
+    assert feat.geometry.model_dump(exclude_unset=True) == Pointy.__geo_interface__
 
 
 def test_feature_with_null_geometry():