Merge lp:~cjwatson/storm/py3-next into lp:storm

[Colin Watson]

Use next(iterator) rather than iterator.next().

This works as of Python 2.6, and is compatible with Python 3.

[Kristian Glass (doismellburning)]

review: Approve

=== modified file 'tests/databases/base.py'
--- tests/databases/base.py	2019-06-07 17:14:33 +0000
+++ tests/databases/base.py	2019-08-11 10:59:55 +0000
@@ -195,12 +195,12 @@
                                           "ORDER BY id DESC")
         iter1 = iter(result1)
         iter2 = iter(result2)
-        self.assertEquals(iter1.next(), (10, "Title 10"))
-        self.assertEquals(iter2.next(), (20, "Title 20"))
-        self.assertEquals(iter1.next(), (20, "Title 20"))
-        self.assertEquals(iter2.next(), (10, "Title 10"))
-        self.assertRaises(StopIteration, iter1.next)
-        self.assertRaises(StopIteration, iter2.next)
+        self.assertEquals(next(iter1), (10, "Title 10"))
+        self.assertEquals(next(iter2), (20, "Title 20"))
+        self.assertEquals(next(iter1), (20, "Title 20"))
+        self.assertEquals(next(iter2), (10, "Title 10"))
+        self.assertRaises(StopIteration, next, iter1)
+        self.assertRaises(StopIteration, next, iter2)
 
     def test_get_insert_identity(self):
         result = self.connection.execute("INSERT INTO test (title) "
@@ -386,7 +386,7 @@
     def test_wb_result_iter_goes_through_from_database(self):
         result = self.connection.execute("SELECT one, two FROM number")
         result.from_database = self.from_database
-        self.assertEquals(iter(result).next(), (2, 3))
+        self.assertEquals(next(iter(result)), (2, 3))
 
     def test_rowcount_insert(self):
         # All supported backends support rowcount, so far.
 
=== modified file 'tests/store/base.py'
--- tests/store/base.py	2019-06-07 17:14:33 +0000
+++ tests/store/base.py	2019-08-11 10:59:55 +0000
@@ -1170,7 +1170,7 @@
 
     def test_find_values_with_no_arguments(self):
         result = self.store.find(Foo).order_by(Foo.id)
-        self.assertRaises(FeatureError, result.values().next)
+        self.assertRaises(FeatureError, next, result.values())
 
     def test_find_slice_values(self):
         values = self.store.find(Foo).order_by(Foo.id)[1:2].values(Foo.id)