Imports abstract base classes from the platform module

Closes #450
pyeve · Oct 10, 2018 · da16545 · da16545
1 parent 5d3ccc0
commit da16545
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 6 deletions.
diff --git a/cerberus/platform.py b/cerberus/platform.py
@@ -12,3 +12,29 @@
 else:
     _str_type = str
     _int_types = (int,)
+
+
+if PYTHON_VERSION < 3.3:
+    from collections import (  # noqa: F401
+        Callable,
+        Container,
+        Hashable,
+        Iterable,
+        Mapping,
+        MutableMapping,
+        Sequence,
+        Set,
+        Sized,
+    )
+else:
+    from collections.abc import (  # noqa: F401
+        Callable,
+        Container,
+        Hashable,
+        Iterable,
+        Mapping,
+        MutableMapping,
+        Sequence,
+        Set,
+        Sized,
+    )
diff --git a/cerberus/schema.py b/cerberus/schema.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-from collections import Callable, Hashable, Mapping, MutableMapping, Sequence
 from copy import copy
 from warnings import warn
 
@@ -12,6 +11,7 @@
     mapping_hash,
     TypeDefinition,
 )
+from cerberus.platform import Callable, Hashable, Mapping, MutableMapping, Sequence
 
 
 class _Abort(Exception):

diff --git a/cerberus/utils.py b/cerberus/utils.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from collections import Mapping, namedtuple, Sequence, Set
+from collections import namedtuple
 
-from cerberus.platform import _int_types, _str_type
+from cerberus.platform import _int_types, _str_type, Mapping, Sequence, Set
 
 
 TypeDefinition = namedtuple('TypeDefinition', 'name,included_types,excluded_types')

diff --git a/cerberus/validator.py b/cerberus/validator.py
@@ -11,14 +11,22 @@
 from __future__ import absolute_import
 
 from ast import literal_eval
-from collections import Container, Hashable, Iterable, Mapping, Sequence, Sized
 from copy import copy
 from datetime import date, datetime
 import re
 from warnings import warn
 
 from cerberus import errors
-from cerberus.platform import _int_types, _str_type
+from cerberus.platform import (
+    _int_types,
+    _str_type,
+    Container,
+    Hashable,
+    Iterable,
+    Mapping,
+    Sequence,
+    Sized,
+)
 from cerberus.schema import (
     schema_registry,
     rules_set_registry,
@@ -27,7 +35,6 @@
 )
 from cerberus.utils import drop_item_from_tuple, readonly_classproperty, TypeDefinition
 
-
 toy_error_handler = errors.ToyErrorHandler()