test/python_tests/shapefile_test.py: ds.all_features() --> iter(ds)

artemp · artemp · commit c61d81cb1bc3 · 2024-05-01T10:42:51.000+01:00
diff --git a/test/python_tests/shapefile_test.py b/test/python_tests/shapefile_test.py
@@ -59,7 +59,7 @@ def test_dbf_logical_field_is_boolean():
         query = mapnik.Query(ds.envelope())
         for fld in ds.fields():
             query.add_property_name(fld)
-        feat = list(ds.all_features())[0]
+        feat = list(iter(ds))[0]
         assert feat.id() ==  1
         assert feat['LONG'] ==  '0'
         assert feat['LAT'] ==  '0'
@@ -75,7 +75,7 @@ def test_shapefile_point2d_from_qgis():
         assert len(ds.fields()) ==  2
         assert ds.fields(), ['id' ==  'name']
         assert ds.field_types(), ['int' ==  'str']
-        assert len(list(ds.all_features())) ==  3
+        assert len(list(iter(ds))) ==  3
 
     # ogr2ogr tests/data/shp/3dpoint/ogr_zfield.shp
     # tests/data/shp/3dpoint/qgis.shp -zfield id
@@ -84,14 +84,14 @@ def test_shapefile_point_z_from_qgis():
         assert len(ds.fields()) ==  2
         assert ds.fields(), ['id' ==  'name']
         assert ds.field_types(), ['int' ==  'str']
-        assert len(list(ds.all_features())) ==  3
+        assert len(list(iter(ds))) ==  3
 
     def test_shapefile_multipoint_from_qgis():
         ds = mapnik.Shapefile(file='../data/shp/points/qgis_multi.shp')
         assert len(ds.fields()) ==  2
         assert ds.fields(), ['id' ==  'name']
         assert ds.field_types(), ['int' ==  'str']
-        assert len(list(ds.all_features())) ==  1
+        assert len(list(iter(ds))) ==  1
 
     # pointzm from arcinfo
     def test_shapefile_point_zm_from_arcgis():
@@ -105,7 +105,7 @@ def test_shapefile_point_zm_from_arcgis():
                                'Name',
                                'Website']
         assert ds.field_types() == ['str', 'str', 'str', 'float', 'float', 'str', 'str']
-        assert len(list(ds.all_features())) ==  17
+        assert len(list(iter(ds))) ==  17
 
     # copy of the above with ogr2ogr that makes m record 14 instead of 18
     def test_shapefile_point_zm_from_ogr():
@@ -119,4 +119,4 @@ def test_shapefile_point_zm_from_ogr():
                             'Name',
                             'Website']
         assert ds.field_types() == ['str', 'str', 'str', 'float', 'float', 'str', 'str']
-        assert len(list(ds.all_features())) ==  17
+        assert len(list(iter(ds))) ==  17
