Merge pull request #28 from sgaynetdinov/fix_raise_stop_iteration

Fix raise error StopIteration

tests/test_fetch.py

@@ -1,7 +1,10 @@
 import io
 
+import pytest
+
 import vk
 from vk.fetch import Session
+from vk.users import User
 
 
 def test_url_open(mocker):
@@ -29,3 +32,12 @@ def test_upload_photo():
     assert b'Content-Type: application/octet-stream' in data
     assert b'Python developer and blogger.' in data
     assert boundary.encode() in data
+
+def test_fetch_items_stop_iteration(mocker):
+    fetch = mocker.patch('vk.fetch.Session.fetch')
+    fetch.return_value = {'items': []}
+
+    got = Session().fetch_items('test', User.from_json, 10)
+
+    with pytest.raises(StopIteration):
+        next(got)

vk/fetch.py

@@ -65,7 +65,7 @@ def fetch_items(self, method_name, constructor_from_json, count, **params):
                 items = res['items']
 
             if not items:
-                raise StopIteration
+                return None
 
             for i in items:
                 yield constructor_from_json(self, i)