Merge pull request #246 from cloudant/245-feed-stack-overflow-fix

Iterate over skipped changes lines

Author: appeltel

CHANGES.rst

@@ -2,6 +2,7 @@
 ==================
 - [FIXED] Resolved issue where generated UUIDs for replication documents would
   not be converted to strings.
+- [FIXED] Resolved issue where database.infinite_changes() method can cause a stack overflow.
 
 2.3.0 (2016-11-02)
 ==================

src/cloudant/feed.py

@@ -155,13 +155,14 @@ def next(self):
 
         :returns: Data representing what was seen in the feed
         """
-        if not self._resp:
-            self._start()
-        if self._stop:
-            raise StopIteration
-        skip, data = self._process_data(next_(self._lines))
-        if skip:
-            return self.next()
+        while True:
+            if not self._resp:
+                self._start()
+            if self._stop:
+                raise StopIteration
+            skip, data = self._process_data(next_(self._lines))
+            if not skip:
+                break
         return data
 
     def _process_data(self, line):
@@ -249,11 +250,19 @@ def next(self):
 
         :returns: Data representing what was seen in the feed
         """
-        if self._source == 'CouchDB':
-            raise CloudantException(
-                'Infinite _db_updates feed not supported for CouchDB.')
-        if self._last_seq:
-            self._options.update({'since': self._last_seq})
-            self._resp = None
-            self._last_seq = None
-        return super(InfiniteFeed, self).next()
+        while True:
+            if self._source == 'CouchDB':
+                raise CloudantException(
+                    'Infinite _db_updates feed not supported for CouchDB.')
+            if self._last_seq:
+                self._options.update({'since': self._last_seq})
+                self._resp = None
+                self._last_seq = None
+            if not self._resp:
+                self._start()
+            if self._stop:
+                raise StopIteration
+            skip, data = self._process_data(next_(self._lines))
+            if not skip:
+                break
+        return data