Merge pull request 0rpc#246 from chombourger/issue-231

bombela · web-flow · commit 465cf16adf7b · 2022-01-05T12:35:20.000-08:00
try collections.abc instead of collections for Python &gt;= 3.4
diff --git a/tests/test_reqstream.py b/tests/test_reqstream.py
@@ -28,11 +28,17 @@
 from builtins import range
 
 import gevent
-import collections
 
 import zerorpc
 from .testutils import teardown, random_ipc_endpoint, TIME_FACTOR
 
+try:
+    # Try collections.abc for 3.4+
+    from collections.abc import Iterator
+except ImportError:
+    # Fallback to collections for Python 2
+    from collections import Iterator
+
 
 def test_rcp_streaming():
     endpoint = random_ipc_endpoint()
@@ -58,7 +64,7 @@ def xrange(self, max):
     assert list(r) == list(range(10))
 
     r = client.xrange(10)
-    assert isinstance(r, collections.Iterator)
+    assert isinstance(r, Iterator)
     l = []
     print('wait 4s for fun')
     gevent.sleep(TIME_FACTOR * 4)
diff --git a/zerorpc/cli.py b/zerorpc/cli.py
@@ -33,11 +33,17 @@
 import inspect
 import os
 import logging
-import collections
 from pprint import pprint
 
 import zerorpc
 
+try:
+    # Try collections.abc for 3.4+
+    from collections.abc import Iterator
+except ImportError:
+    # Fallback to collections for Python 2
+    from collections import Iterator
+
 
 parser = argparse.ArgumentParser(
     description='Make a zerorpc call to a remote service.'
@@ -267,7 +273,7 @@ def run_client(args):
     else:
         call_args = args.params
     results = client(args.command, *call_args)
-    if not isinstance(results, collections.Iterator):
+    if not isinstance(results, Iterator):
         if args.print_json:
             json.dump(results, sys.stdout)
         else:
