Skip to content

Commit c268f7e

Browse files
committed
Run next_call fixer on tests
1 parent 8303688 commit c268f7e

9 files changed

+69
-69
lines changed

tests/src/python/test_provider_mssql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def testDateTimeTypes(self):
7070
self.assertEqual(fields.at(fields.indexFromName(
7171
'datetime_field')).type(), QVariant.DateTime)
7272

73-
f = vl.getFeatures(QgsFeatureRequest()).next()
73+
f = next(vl.getFeatures(QgsFeatureRequest()))
7474

7575
date_idx = vl.fieldNameIndex('date_field')
7676
assert isinstance(f.attributes()[date_idx], QDate)

tests/src/python/test_provider_postgres.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def testDateTimeTypes(self):
7979
self.assertEqual(fields.at(fields.indexFromName('time_field')).type(), QVariant.Time)
8080
self.assertEqual(fields.at(fields.indexFromName('datetime_field')).type(), QVariant.DateTime)
8181

82-
f = vl.getFeatures(QgsFeatureRequest()).next()
82+
f = next(vl.getFeatures(QgsFeatureRequest()))
8383

8484
date_idx = vl.fieldNameIndex('date_field')
8585
self.assertTrue(isinstance(f.attributes()[date_idx], QDate))

tests/src/python/test_provider_tabfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def testDateTimeFormats(self):
4040
self.assertEqual(fields.at(fields.indexFromName('time')).type(), QVariant.Time)
4141
self.assertEqual(fields.at(fields.indexFromName('date_time')).type(), QVariant.DateTime)
4242

43-
f = vl.getFeatures(QgsFeatureRequest()).next()
43+
f = next(vl.getFeatures(QgsFeatureRequest()))
4444

4545
date_idx = vl.fieldNameIndex('date')
4646
assert isinstance(f.attributes()[date_idx], QDate)

tests/src/python/test_qgsrelation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def test_getRelatedFeatures(self):
105105
rel.setReferencedLayer(self.referencedLayer.id())
106106
rel.addFieldPair('foreignkey', 'y')
107107

108-
feat = self.referencedLayer.getFeatures().next()
108+
feat = next(self.referencedLayer.getFeatures())
109109

110110
it = rel.getRelatedFeatures(feat)
111111

@@ -119,7 +119,7 @@ def test_getReferencedFeature(self):
119119
rel.setReferencedLayer(self.referencedLayer.id())
120120
rel.addFieldPair('foreignkey', 'y')
121121

122-
feat = self.referencingLayer.getFeatures().next()
122+
feat = next(self.referencingLayer.getFeatures())
123123

124124
f = rel.getReferencedFeature(feat)
125125

tests/src/python/test_qgsrelationeditwidget.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def choose_linked_feature():
173173
btn.click()
174174
# magically the above code selects the feature here...
175175

176-
link_feature = self.vl_link.getFeatures(QgsFeatureRequest().setFilterExpression('"fk_book"={}'.format(f[0]))).next()
176+
link_feature = next(self.vl_link.getFeatures(QgsFeatureRequest().setFilterExpression('"fk_book"={}'.format(f[0]))))
177177
self.assertIsNotNone(link_feature[0])
178178

179179
self.assertEquals(self.table_view.model().rowCount(), 1)
@@ -258,7 +258,7 @@ def createWrapper(self, layer, filter=None):
258258
request = QgsFeatureRequest()
259259
if filter:
260260
request.setFilterExpression(filter)
261-
book = layer.getFeatures(request).next()
261+
book = next(layer.getFeatures(request))
262262
self.wrapper.setFeature(book)
263263

264264
self.table_view = self.widget.findChild(QTableView)

tests/src/python/test_qgsvectorfilewriter.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def testDateTimeWriteShapefile(self):
9999
#shapefiles do not support datetime types, result should be string
100100
self.assertEqual(fields.at(fields.indexFromName('dt_f')).type(), QVariant.String)
101101

102-
f = created_layer.getFeatures(QgsFeatureRequest()).next()
102+
f = next(created_layer.getFeatures(QgsFeatureRequest()))
103103

104104
date_idx = created_layer.fieldNameIndex('date_f')
105105
assert isinstance(f.attributes()[date_idx], QDate)
@@ -152,7 +152,7 @@ def testDateTimeWriteTabfile(self):
152152
self.assertEqual(fields.at(fields.indexFromName('time_f')).type(), QVariant.Time)
153153
self.assertEqual(fields.at(fields.indexFromName('dt_f')).type(), QVariant.DateTime)
154154

155-
f = created_layer.getFeatures(QgsFeatureRequest()).next()
155+
f = next(created_layer.getFeatures(QgsFeatureRequest()))
156156

157157
date_idx = created_layer.fieldNameIndex('date_f')
158158
assert isinstance(f.attributes()[date_idx], QDate)
@@ -201,7 +201,7 @@ def testWriteShapefileWithZ(self):
201201

202202
# Open result and check
203203
created_layer = QgsVectorLayer(u'{}|layerid=0'.format(dest_file_name), u'test', u'ogr')
204-
f = created_layer.getFeatures(QgsFeatureRequest()).next()
204+
f = next(created_layer.getFeatures(QgsFeatureRequest()))
205205
g = f.geometry()
206206
wkt = g.exportToWkt()
207207
expWkt = 'PointZ (1 2 3)'
@@ -223,7 +223,7 @@ def testWriteShapefileWithZ(self):
223223

224224
# Open result and check
225225
created_layer_from_shp = QgsVectorLayer(u'{}|layerid=0'.format(dest_file_name), u'test', u'ogr')
226-
f = created_layer_from_shp.getFeatures(QgsFeatureRequest()).next()
226+
f = next(created_layer_from_shp.getFeatures(QgsFeatureRequest()))
227227
g = f.geometry()
228228
wkt = g.exportToWkt()
229229
assert compareWkt(expWkt, wkt), "saving geometry with Z failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
@@ -261,7 +261,7 @@ def testWriteShapefileWithMultiConversion(self):
261261

262262
# Open result and check
263263
created_layer = QgsVectorLayer(u'{}|layerid=0'.format(dest_file_name), u'test', u'ogr')
264-
f = created_layer.getFeatures(QgsFeatureRequest()).next()
264+
f = next(created_layer.getFeatures(QgsFeatureRequest()))
265265
g = f.geometry()
266266
wkt = g.exportToWkt()
267267
expWkt = 'MultiPoint ((1 2))'
@@ -302,7 +302,7 @@ def testWriteShapefileWithAttributeSubsets(self):
302302
# Open result and check
303303
created_layer = QgsVectorLayer(u'{}|layerid=0'.format(dest_file_name), u'test', u'ogr')
304304
self.assertEqual(created_layer.fields().count(), 4)
305-
f = created_layer.getFeatures(QgsFeatureRequest()).next()
305+
f = next(created_layer.getFeatures(QgsFeatureRequest()))
306306
self.assertEqual(f['id'], 1)
307307
self.assertEqual(f['field1'], 11)
308308
self.assertEqual(f['field2'], 12)
@@ -322,7 +322,7 @@ def testWriteShapefileWithAttributeSubsets(self):
322322
# Open result and check
323323
created_layer = QgsVectorLayer(u'{}|layerid=0'.format(dest_file_name), u'test', u'ogr')
324324
self.assertEqual(created_layer.fields().count(), 2)
325-
f = created_layer.getFeatures(QgsFeatureRequest()).next()
325+
f = next(created_layer.getFeatures(QgsFeatureRequest()))
326326
self.assertEqual(f['field1'], 11)
327327
self.assertEqual(f['field3'], 13)
328328

@@ -344,7 +344,7 @@ def testWriteShapefileWithAttributeSubsets(self):
344344
self.assertEqual(created_layer.fields()[0].name(), 'FID')
345345
# in this case we also check that the geometry exists, to make sure feature has been correctly written
346346
# even without attributes
347-
f = created_layer.getFeatures(QgsFeatureRequest()).next()
347+
f = next(created_layer.getFeatures(QgsFeatureRequest()))
348348
g = f.geometry()
349349
wkt = g.exportToWkt()
350350
expWkt = 'Point (1 2)'

0 commit comments

Comments
 (0)