Python 3.5.2 fix. Fixes #30

Author: Sylvain MARIE

valid8/composition.py

@@ -1,6 +1,5 @@
 from abc import abstractmethod
 from collections import OrderedDict
-from sys import version_info
 
 from makefun import with_signature
 
@@ -29,11 +28,14 @@
     ValidationFuncs = Union[ValidationFunc, List['ValidationFuncs']]  # recursion is used here ('forward reference')
     """ Represents the 'typing' type for 'validation_func' arguments in the various methods """
 
+    use_typing = True
+
 except TypeError:
     # this happens with python 3.5.2: typing has an issue.
-    pass
+    use_typing = False
+
 except ImportError:
-    pass
+    use_typing = False
 
 
 supported_syntax = 'a callable, a tuple(callable, help_msg_str), a tuple(callable, failure_type), or a list of ' \
@@ -428,7 +430,7 @@ def xor_v_(x):
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(*validation_func: ValidationFuncs,
                   catch_all: bool = False) -> Callable"""
 else:
@@ -462,7 +464,7 @@ def not_all(*validation_func,  # type: ValidationFuncs
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(*validation_func: ValidationFuncs,
                   failure_type: 'Type[WrappingFailure]' = None,
                   help_msg: str = None,

valid8/entry_points.py

@@ -1,6 +1,5 @@
 import sys
 from copy import copy
-from sys import version_info
 
 from makefun import with_signature
 from six import with_metaclass
@@ -12,8 +11,9 @@
     except ImportError:
         pass
     from valid8.composition import ValidationFuncs
+    use_typing = True
 except ImportError:
-    pass
+    use_typing = False
 
 from valid8.utils_string import end_with_dot
 from valid8.base import result_is_success, get_callable_name, _none_accepter, _none_rejecter, RootException, \
@@ -370,7 +370,7 @@ class new_error_type(with_metaclass(MetaReprForValidator, error_type, additional
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(self,
                   *validation_func: ValidationFuncs,
                   error_type: 'Type[ValidationError]' = None,
@@ -653,7 +653,7 @@ def is_valid(self,
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(name: str,
                   value: Any,
                   *validation_func: ValidationFuncs,
@@ -712,7 +712,7 @@ def assert_valid(name,              # type: str
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(value, 
                   *validation_func: Union[Callable, List[Callable]], 
                   none_policy: int=None):"""

valid8/entry_points_annotations.py

@@ -1,6 +1,5 @@
 import sys
 from inspect import ismethod, isclass
-from sys import version_info
 
 from decopatch import class_decorator, function_decorator, DECORATED
 
@@ -11,8 +10,9 @@
     except ImportError:
         pass
     from valid8.composition import ValidationFuncs
+    use_typing = True
 except ImportError:
-    pass
+    use_typing = False
 
 try:
     from inspect import signature, Signature
@@ -91,7 +91,7 @@ def get_variable_str(self):
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(self,
                   validated_func: Callable, 
                   *validation_func: ValidationFuncs,
@@ -255,7 +255,7 @@ def assert_valid(self,
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(self,
                   validated_class: Callable,
                   validated_field_name: str,
@@ -335,7 +335,7 @@ def get_validated_class_display_name(self):
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(cls, 
                   field_name,
                   *validation_func: ValidationFuncs,
@@ -425,7 +425,7 @@ def myfunc(a, b):
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(f, 
                   arg_name, 
                   *validation_func: ValidationFuncs, 
@@ -470,7 +470,7 @@ def validate_arg(f,
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(*validation_func: ValidationFuncs, 
                   help_msg: str = None,
                   error_type: 'Type[OutputValidationError]' = None, 
@@ -509,7 +509,7 @@ def decorate(f):
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(cls, 
                   field_name: str, 
                   *validation_func: ValidationFuncs, 
@@ -697,7 +697,7 @@ def decorate_several_with_validation(func,
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(func, 
                   arg_name: str, 
                   *validation_func: ValidationFuncs, 
@@ -801,7 +801,7 @@ class fields)"""
 
 
 # Python 3+: load the 'more explicit api'
-if version_info >= (3, 0):
+if use_typing:
     new_sig = """(validated_func: Callable, 
                   s: Signature, 
                   arg_name: str,