Use the next() builtin for Python 3 compatibility

Schnouki · kxepal · commit 7d50b47b587d · 2014-08-12T17:31:24.000+04:00
`iterator.next()` has been replaced by `next(iterator)` in Python 3.

Also add a test for retrying requests after a socket timeout.

Signed-off-by: Alexander Shorin &lt;kxepal@gmail.com&gt;
diff --git a/couchdb/http.py b/couchdb/http.py
@@ -315,7 +315,7 @@ def _try_request_with_retries(retries):
                     if ecode not in self.retryable_errors:
                         raise
                     try:
-                        delay = retries.next()
+                        delay = next(retries)
                     except StopIteration:
                         # No more retries, raise last socket error.
                         raise e
diff --git a/couchdb/tests/couchhttp.py b/couchdb/tests/couchhttp.py
@@ -25,6 +25,12 @@ def test_timeout(self):
         self.assertRaises(socket.timeout, body.read)
         self.assertTrue(time.time() - start < timeout * 1.3)
 
+    def test_timeout_retry(self):
+        dbname, db = self.temp_db()
+        timeout = 1e-12
+        session = http.Session(timeout=timeout, retryable_errors=["timed out"])
+        self.assertRaises(socket.timeout, session.request, 'GET', db.resource.url)
+
 
 class ResponseBodyTestCase(unittest.TestCase):
     def test_close(self):
