Import ABCs from collections.abc. Closes #150

.travis.yml

@@ -1,11 +1,15 @@
+dist: xenial
 language: python
 sudo: false
 python:
   - "2.7"
   - "3.6"
-  - "3.7-dev"
-  - "pypy"
-  - "pypy-5.3.1"
+  - "3.7"
+  - "3.8-dev"
+
+matrix:
+    allow_failures:
+        - python: "3.8-dev"
 
 # command to install dependencies
 install:

sure/compat.py

@@ -5,6 +5,11 @@
 import six
 from collections import OrderedDict
 
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
+
 from sure.terminal import red, green, yellow
 
 

sure/old.py

@@ -22,10 +22,6 @@
 from copy import deepcopy
 from pprint import pformat
 from functools import wraps
-try:
-    from collections import Iterable
-except ImportError:
-    Iterable = (list, dict, tuple, set)
 
 try:
     import __builtin__ as builtins
@@ -43,6 +39,7 @@
 from sure.core import _get_file_name
 from sure.core import _get_line_number
 from sure.core import itemize_length
+from sure.compat import Iterable
 
 
 def identify_callable_location(callable_object):

tests/test_assertion_builder.py

@@ -137,7 +137,7 @@ def test_should_be_a():
     ("this(None).should.be.none")
 
     assert this(1).should.be.an(int)
-    assert this([]).should.be.a('collections.Iterable')
+    assert this([]).should.be.a('sure.compat.Iterable')
     assert this({}).should_not.be.a(list)
 
     def opposite():