Fixed ValidationError happening in all use cases. Fixed #25

Author: Sylvain MARIE

autoclass/autoargs_.py

@@ -1,8 +1,7 @@
 import sys
-from collections import Sequence, OrderedDict
+from collections import OrderedDict
 
 from makefun import wraps
-from valid8 import validate
 
 try:  # python 3+
     from inspect import signature
@@ -16,7 +15,7 @@
 
 from decopatch import function_decorator, DECORATED
 
-from autoclass.utils import is_attr_selected
+from autoclass.utils import is_attr_selected, validate_include_exclude
 
 
 @function_decorator
@@ -76,10 +75,7 @@ def autoargs_decorate(func,          # type: Callable
     """
 
     # (0) first check parameters
-    if include is not None and exclude is not None:
-        raise ValueError('Only one of \'include\' or \'exclude\' argument should be provided.')
-    validate('include', include, instance_of=[str, Sequence], enforce_not_none=False)
-    validate('exclude', exclude, instance_of=[str, Sequence], enforce_not_none=False)
+    validate_include_exclude(include, exclude)
 
     # (1) then retrieve function signature
     # attrs, varargs, varkw, defaults = getargspec(func)

autoclass/autodict_.py

@@ -1,10 +1,8 @@
-from collections import Mapping, Sequence
+from collections import Mapping
 from warnings import warn
 
 from six import with_metaclass
 
-from valid8 import validate
-
 try:  # python 3+
     from inspect import signature
 except ImportError:
@@ -21,7 +19,8 @@
     pass
 
 from autoclass.autoprops_ import DuplicateOverrideError
-from autoclass.utils import is_attr_selected, method_already_there, possibly_replace_with_property_name
+from autoclass.utils import is_attr_selected, method_already_there, possibly_replace_with_property_name, \
+    validate_include_exclude
 from autoclass.utils import get_constructor
 from autoclass.utils import _check_known_decorators
 
@@ -123,11 +122,8 @@ def _execute_autodict_on_class(object_type,                 # type: Type[T]
         hidden
     :return:
     """
-
-    if include is not None and exclude is not None:
-        raise ValueError('Only one of \'include\' or \'exclude\' argument should be provided.')
-    validate('include', include, instance_of=[str, Sequence], enforce_not_none=False)
-    validate('exclude', exclude, instance_of=[str, Sequence], enforce_not_none=False)
+    # 0. first check parameters
+    validate_include_exclude(include, exclude)
 
     # if issubclass(object_type, Mapping):
     #     raise ValueError('@autodict can not be set on classes that are already subclasses of Mapping, and therefore '

autoclass/autohash_.py

@@ -1,4 +1,3 @@
-from collections import Sequence
 try:
     from inspect import signature
 except ImportError:
@@ -15,10 +14,10 @@
 except ImportError:
     pass
 
-from valid8 import validate
 from decopatch import class_decorator, DECORATED
 
-from autoclass.utils import is_attr_selected, method_already_there, possibly_replace_with_property_name
+from autoclass.utils import is_attr_selected, method_already_there, possibly_replace_with_property_name, \
+    validate_include_exclude
 from autoclass.utils import get_constructor
 from autoclass.utils import _check_known_decorators
 
@@ -110,11 +109,8 @@ def _execute_autohash_on_class(object_type,                  # type: Type[T]
     not be taken into account in the hash. Please note that this behaviour is the opposite from @autodict.
     :return:
     """
-
-    if include is not None and exclude is not None:
-        raise ValueError('Only one of \'include\' or \'exclude\' argument should be provided.')
-    validate('include', include, instance_of=[str, Sequence], enforce_not_none=False)
-    validate('exclude', exclude, instance_of=[str, Sequence], enforce_not_none=False)
+    # First check parameters
+    validate_include_exclude(include, exclude)
 
     # Override hash method if not already implemented
     if not method_already_there(object_type, '__hash__'):

autoclass/autoprops_.py

@@ -1,4 +1,3 @@
-from collections import Sequence
 from copy import copy
 from inspect import getmembers
 from warnings import warn
@@ -21,9 +20,8 @@
     pass
 
 from decopatch import DECORATED, function_decorator, class_decorator
-from valid8 import validate
 
-from autoclass.utils import is_attr_selected
+from autoclass.utils import is_attr_selected, validate_include_exclude
 from autoclass.utils import get_constructor
 from autoclass.utils import _check_known_decorators
 
@@ -113,11 +111,8 @@ def _execute_autoprops_on_class(object_type,   # type: Type[T]
     :param exclude: a tuple of explicit attribute names to exclude. In such case, include should be None.
     :return:
     """
-
-    if include is not None and exclude is not None:
-        raise ValueError('Only one of \'include\' or \'exclude\' argument should be provided.')
-    validate('include', include, instance_of=[str, Sequence], enforce_not_none=False)
-    validate('exclude', exclude, instance_of=[str, Sequence], enforce_not_none=False)
+    # 0. first check parameters
+    validate_include_exclude(include, exclude)
 
     # 1. Find the __init__ constructor signature and possible pycontracts @contract
     constructor = get_constructor(object_type, allow_inheritance=True)

autoclass/utils.py

@@ -1,9 +1,25 @@
+from collections import Sequence
+from valid8 import validate
+
 try:  # python 3.5+
     from typing import Union, Tuple
 except ImportError:
     pass
 
 
+def validate_include_exclude(include, exclude):
+    """
+    Common validator for include and exclude arguments
+    :param include:
+    :param exclude:
+    :return:
+    """
+    if include is not None and exclude is not None:
+        raise ValueError("Only one of 'include' or 'exclude' argument should be provided.")
+    validate('include', include, instance_of=(str, Sequence), enforce_not_none=False)
+    validate('exclude', exclude, instance_of=(str, Sequence), enforce_not_none=False)
+
+
 def is_attr_selected(attr_name,     # type: str
                      include=None,  # type: Union[str, Tuple[str]]
                      exclude=None   # type: Union[str, Tuple[str]]