Fixed up cursor iteration more properly(?)

diff --git a/manga/lib.py b/manga/lib.py
index 8cc96cb712d9f398f0c18bda1a839fe74b953c93..da64e0c1a0e4ee56d7b632d6d2170e0c59ae5dce 100644 (file)
--- a/manga/lib.py
+++ b/manga/lib.py
@@ -206,9 +206,6 @@ class cursor(object):
                 return self.cur
         raise StopIteration()
 
-    def __next__(self):
-        return self.next()
-
     def prev(self):
         for n, i in reversed(self.cur.stack):
             if i > 0:
@@ -217,7 +214,14 @@ class cursor(object):
         raise StopIteration()
 
     def __iter__(self):
-        return self
+        def iterator():
+            yield self.cur
+            while True:
+                try:
+                    yield self.next()
+                except StopIteration:
+                    break
+        return iterator()
 
 loaded = {}
 def findlib(name):