six.moves.collections_abc

Author: elacuesta

scrapinghub/hubstorage/resourcetype.py

@@ -2,14 +2,10 @@
 import logging
 import socket
 import time
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
 
 import six
 import requests.exceptions as rexc
-from six.moves import range
+from six.moves import range, collections_abc
 
 from .utils import urlpathjoin, xauth
 from .serialization import jlencode, jldecode, mpdecode
@@ -233,7 +229,7 @@ def stats(self):
         return next(self.apiget('stats', chunk_size=STATS_CHUNK_SIZE))
 
 
-class MappingResourceType(ResourceType, MutableMapping):
+class MappingResourceType(ResourceType, collections_abc.MutableMapping):
 
     _cached = None
     ignore_fields = ()

tests/client/test_frontiers.py

@@ -1,8 +1,8 @@
 import time
 from types import GeneratorType
-from collections import Iterable
 
 from six import string_types
+from six.moves import collections_abc
 
 from scrapinghub.client.frontiers import Frontiers, Frontier, FrontierSlot
 from ..conftest import TEST_FRONTIER_SLOT
@@ -36,7 +36,7 @@ def test_frontiers(project, frontier, frontier_name):
 
     # test for iter() method
     frontiers_names = frontiers.iter()
-    assert isinstance(frontiers_names, Iterable)
+    assert isinstance(frontiers_names, collections_abc.Iterable)
     assert frontier_name in list(frontiers_names)
 
     # test for list() method
@@ -58,7 +58,7 @@ def test_frontier(project, frontier):
     _add_test_requests_to_frontier(frontier)
 
     slots = frontier.iter()
-    assert isinstance(slots, Iterable)
+    assert isinstance(slots, collections_abc.Iterable)
     assert TEST_FRONTIER_SLOT in list(slots)
 
     slots = frontier.list()

tests/client/test_job.py

@@ -1,6 +1,5 @@
-from collections import Iterator
-
 import pytest
+from six.moves import collections_abc
 
 from scrapinghub.client.items import Items
 from scrapinghub.client.jobs import Job
@@ -224,7 +223,7 @@ def test_metadata_delete(spider):
 def test_metadata_iter_list(spider):
     job = spider.jobs.run(meta={'meta1': 'data1', 'meta2': 'data2'})
     meta_iter = job.metadata.iter()
-    assert isinstance(meta_iter, Iterator)
+    assert isinstance(meta_iter, collections_abc.Iterator)
     meta_list = job.metadata.list()
     assert ('meta1', 'data1') in meta_list
     assert ('meta2', 'data2') in meta_list

tests/client/test_projects.py

@@ -1,10 +1,10 @@
 import types
-from collections import defaultdict, Iterator
+from collections import defaultdict
 
 import pytest
 import responses
-from six.moves import range
 from requests.compat import urljoin
+from six.moves import range, collections_abc
 
 from scrapinghub import ScrapinghubClient
 from scrapinghub.client.activity import Activity
@@ -288,7 +288,7 @@ def test_settings_delete(project):
 def test_settings_iter_list(project):
     project.settings.set('job_runtime_limit', 24)
     settings_iter = project.settings.iter()
-    assert isinstance(settings_iter, Iterator)
+    assert isinstance(settings_iter, collections_abc.Iterator)
     settings_list = project.settings.list()
     assert ('job_runtime_limit', 24) in settings_list
     assert settings_list == list(settings_iter)