Added iterability

Author: alemazzo

stream/iterators.py

@@ -22,7 +22,7 @@ def generate(generator):
     @staticmethod
     def concat(*iterables):
         for iterable in iterables:
-            for elem in iterable.iterator():
+            for elem in iterable:
                 yield elem
 
     """
@@ -42,7 +42,7 @@ def map(iterable, mapper):
     @staticmethod
     def flatMap(iterable, mapper):
         for elem in iterable:
-            for internal in mapper(elem).iterator():
+            for internal in mapper(elem):
                 yield internal
 
     @staticmethod

stream/stream.py

@@ -7,9 +7,9 @@
 class Stream():
 
     """
-    A sequence of elements supporting sequential operations. 
+    A sequence of elements supporting sequential operations.
 
-    The following example illustrates an aggregate operation using 
+    The following example illustrates an aggregate operation using
     Stream:
 
         result = Stream(elements)
@@ -323,13 +323,18 @@ def toSet(self):
         '''
         return set(self.__iterable)
 
-    def iterator(self):
+    def __iter__(self):
         '''
         Returns an iterator over the elements in this stream.
 
         :return: the iterator over the elements in this stream
         '''
-        return self.__iterable
+        return iter(self.__iterable)
 
     def __eq__(self, value):
+        '''
+        Check if this stream is equal to the specified stream
+
+        :return: True if the streams match, False otherwise
+        '''
         return self.__iterable == value.__iterable

test.py

@@ -22,7 +22,7 @@ def test_of(self):
 
     def test_iterate(self):
         index = 0
-        s = Stream.iterate(index, lambda i: i + 1).iterator()
+        s = Stream.iterate(index, lambda i: i + 1)
 
         for elem in s:
             self.assertEqual(elem, index)
@@ -32,7 +32,7 @@ def test_iterate(self):
 
     def test_generate(self):
         index = 0
-        s = Stream.generate(lambda: 1).iterator()
+        s = Stream.generate(lambda: 1)
 
         for elem in s:
             self.assertEqual(elem, 1)
@@ -157,6 +157,13 @@ def test_count(self):
         self.assertEqual(Stream.empty().count(), 0)
         self.assertEqual(Stream.generate(lambda: 1).limit(10).count(), 10)
 
+    def test_iter(self):
+        index = 1
+        s = Stream.of(1, 2, 3)
+        for elem in s:
+            self.assertEqual(elem, index)
+            index += 1
+
 
 if __name__ == '__main__':
     unittest.main()