[test_*.py] Replace pytest with unittest; [test_validators.py] Implem…

…ent for `literal`; [*.py] black; use `object` base class
RussBaz · SamuelMarks · Oct 25, 2020 · Oct 25, 2020 · Oct 26, 2020 · Oct 26, 2020
commit 451ef6289a5fa522010afc429956a7e5d53bbd64
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,18 1,18 @@
 name: Test
 
 on:
- push:
- branches:
- - 'master'
- - 'dev'
   push:
   branches:
   - 'master'
   - 'dev'
 
 jobs:
  test:
  name: ${{ matrix.os.name }} ${{ matrix.python-version }}
  runs-on: ${{ matrix.os.runs-on }}
  strategy:
  matrix:
- python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
  python-version: [ 3.5, 3.6, 3.7, 3.8, 3.9 ]
  os:
  - name: Linux
  runs-on: ubuntu-latest

diff --git a/enforce/__init__.py b/enforce/__init__.py
@@ -1,3 1,3 @@
 from .decorators import runtime_validation
-from .settings import config
 from .protocol import P
 from .settings import config
diff --git a/enforce/enforcers.py b/enforce/enforcers.py
@@ -18,7 18,7 @@
 Parameters = namedtuple("Parameters", ["args", "kwargs", "skip"])
 
 
-class Enforcer:
 class Enforcer(object):
  """
  A container for storing type checking logic of functions
  """
@@ -108,7 108,6 @@ def validate_inputs(self, input_data: Parameters) -> Parameters:
  bind_arguments.args, bind_arguments.kwargs, skip
  )
  return validated_data
-
  process_errors(self.settings, self.validator.errors, self.hints)
 
  def validate_outputs(self, output_data: T) -> T:
@@ -172,7 171,9 @@ def __init__(self, wrapped, settings=None):
  )
  elif is_type_of_type(wrapped_type, typing.GenericMeta):
  super().__init__(wrapped)
- self.__enforcer__ = get_enforcer(self, generic=True, settings=self._self_settings)
  self.__enforcer__ = get_enforcer(
  self, generic=True, settings=self._self_settings
  )
  else:
  raise TypeError("Only generics can be wrapped in GenericProxy")
 
@@ -323,7 324,6 @@ def generate_new_enforcer(func, generic, parent_root, instance_of, settings):
  bound = False
  validator = init_validator(settings, hints, parent_root)
 
-
  if hasattr(func, "__name__"):
  name = func.__name__
  elif hasattr(func, "__class__"):

diff --git a/enforce/nodes.py b/enforce/nodes.py
@@ -17,10 17,10 @@
 }
 
 
-class BaseNode:
 class BaseNode(object):
  def __init__(
  self,
- expected_data_type: type,
  expected_data_type: typing.Optional[type],
  is_sequence: bool,
  is_container: bool = False,
  is_forward_ref: bool = None,
@@ -51,7 51,7 @@ def __init__(
  self.children = []
 
  def validate_children(
- self, validator: typing.Literal["Validator"], propagated_data: typing.Any
  self, validator: "Validator", propagated_data: typing.Any
  ) -> typing.List[dt.ValidationResult]:
  """
  Performs the validation of child nodes and collects their results
@@ -111,42 111,48 @@ def get_actual_data_type(
 
  return actual_type
 
- def set_out_data(self, validator: typing.Literal["Validator"], in_data, out_data):
  def set_out_data(self, validator: "Validator", in_data, out_data):
  """
  Sets the output data for the node to the combined data of its children
  Also sets the type of a last processed node
  """
  self.in_type = type(in_data)
  self.data_out = out_data
 
- def preprocess_data(self, validator: typing.Literal["Validator"], data):
  def preprocess_data(self, validator: "Validator", data):
  """
  Prepares data for the other stages if needed
  """
  return data
 
- def postprocess_data(self, validator: typing.Literal["Validator"], data):
  @staticmethod
  def postprocess_data(validator: "Validator", data):
  """
  Clears or updates data if needed after it was processed by all other stages
  """
  return data
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False) -> bool:
  def validate_data(
  self, validator: "Validator", data, sticky=False
  ) -> dt.ValidationResult:
  """
  Responsible for determining if node is of specific type
  """
  return dt.ValidationResult(
  valid=False, data=data, type_name=extract_type_name(data)
  )
 
- def map_data(self, validator: typing.Literal["Validator"], self_validation_result):
  def map_data(self, validator: "Validator", self_validation_result):
  """
  Maps the input data to the nested type nodes
  """
  return []
 
  def reduce_data(
- self, validator: typing.Literal["Validator"], self_validation_result, child_validation_results
  self,
  validator: "Validator",
  self_validation_result,
  child_validation_results,
  ):
  """
  Combines the data from the nested type nodes into a current node expected data type
@@ -182,7 188,7 @@ class SimpleNode(BaseNode):
  def __init__(self, expected_data_type, **kwargs):
  super().__init__(expected_data_type, is_sequence=True, type_var=False, **kwargs)
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  if self.bound:
  expected_data_type = self.in_type
  else:
@@ -208,12 214,14 @@ def validate_data(self, validator: typing.Literal["Validator"], data, sticky=Fal
 
  type_name = TYPE_NAME_ALIASES.get(type_name, type_name)
 
- if getattr(expected_data_type, '__origin__', None) == typing.Literal and data in frozenset(expected_data_type.__args__):
  if getattr(
  expected_data_type, "__origin__", None
  ) == typing.Literal and data in frozenset(expected_data_type.__args__):
  result, type_name = True, expected_data_type
 
  return dt.ValidationResult(valid=result, data=data, type_name=type_name)
 
- def map_data(self, validator: typing.Literal["Validator"], self_validation_result):
  def map_data(self, validator: "Validator", self_validation_result):
  data = self_validation_result.data
  propagated_data = []
  if isinstance(data, list):
@@ -237,16 245,19 @@ class UnionNode(BaseNode):
  def __init__(self, **kwargs):
  super().__init__(typing.Any, is_sequence=False, is_container=True, **kwargs)
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  return dt.ValidationResult(
  valid=True, data=data, type_name=extract_type_name(data)
  )
 
- def map_data(self, validator: typing.Literal["Validator"], self_validation_result):
  def map_data(self, validator: "Validator", self_validation_result):
  return [self_validation_result.data for _ in self.children]
 
  def reduce_data(
- self, validator: typing.Literal["Validator"], self_validation_result, child_validation_result
  self,
  validator: "Validator",
  self_validation_result,
  child_validation_result,
  ):
  return next(
  (
@@ -277,14 288,17 @@ def __init__(self, **kwargs):
  expected_data_type=None, is_sequence=True, type_var=True, **kwargs
  )
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  return dt.ValidationResult(valid=True, data=data, type_name="typing.TypeVar")
 
- def map_data(self, validator: typing.Literal["Validator"], self_validation_result):
  def map_data(self, validator: "Validator", self_validation_result):
  return [self_validation_result.data for _ in self.children]
 
  def reduce_data(
- self, validator: typing.Literal["Validator"], self_validation_result, child_validation_results
  self,
  validator: "Validator",
  self_validation_result,
  child_validation_results,
  ):
  # Returns first non-None element, or None if every element is None
  return next(
@@ -296,7 310,7 @@ def reduce_data(
  None,
  )
 
- def validate_children(self, validator: typing.Literal["Validator"], propagated_data):
  def validate_children(self, validator: "Validator", propagated_data):
  children_validation_results = []
 
  for i, child in enumerate(self.children):
@@ -329,7 343,7 @@ def __init__(self, variable_length=False, **kwargs):
  self.variable_length = variable_length
  super().__init__(typing.Tuple, is_sequence=True, is_container=True, **kwargs)
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  # fix for https://github.com/RussBaz/enforce/issues/62 (1/4)
  if data is None:
  # unfortunately this is not enough to stop propagating to children...
@@ -364,7 378,7 @@ def validate_data(self, validator: typing.Literal["Validator"], data, sticky=Fal
  valid=False, data=data, type_name=extract_type_name(input_type)
  )
 
- def validate_children(self, validator: typing.Literal["Validator"], propagated_data):
  def validate_children(self, validator: "Validator", propagated_data):
  # fix for https://github.com/RussBaz/enforce/issues/62 (3/4)
  if propagated_data is None:
  # yield a sequence of one element: a single failure
@@ -389,7 403,7 @@ def validate_children(self, validator: typing.Literal["Validator"], propagated_d
  else:
  yield super().validate_children(validator, propagated_data)
 
- def map_data(self, validator: typing.Literal["Validator"], self_validation_result):
  def map_data(self, validator: "Validator", self_validation_result):
  data = self_validation_result.data
  # fix for https://github.com/RussBaz/enforce/issues/62 (2/4)
  if data is not None:
@@ -401,7 415,10 @@ def map_data(self, validator: typing.Literal["Validator"], self_validation_resul
  return None
 
  def reduce_data(
- self, validator: typing.Literal["Validator"], self_validation_result, child_validation_results
  self,
  validator: "Validator",
  self_validation_result,
  child_validation_results,
  ):
  return tuple(result.data for result in child_validation_results)
 
@@ -442,7 459,7 @@ def __init__(self, data_type, exception_type, **kwargs):
  self.data_type_name = None
  self.exception_type = exception_type
 
- def preprocess_data(self, validator: typing.Literal["Validator"], data):
  def preprocess_data(self, validator: "Validator", data):
  data_type = type(data)
 
  self.data_type_name = data_type.__name__
@@ -466,17 483,17 @@ def preprocess_data(self, validator: typing.Literal["Validator"], data):
  str(type(data))
  " with incorrect arguments: "
  ", ".join(
-  field " -> " str(type(getattr(data, field)))
-  for field in data._fields
-  )
  field " -> " str(type(getattr(data, field)))
  for field in data._fields
  )
  )
  return None
  except AttributeError:
  return None
  except TypeError:
  return None
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  if data is None:
  data_type_name = self.data_type_name
  else:
@@ -508,7 525,7 @@ def __init__(self, data_type, **kwargs):
  data_type, is_sequence=True, is_container=True, type_var=False, **kwargs
  )
 
- def preprocess_data(self, validator: typing.Literal["Validator"], data):
  def preprocess_data(self, validator: "Validator", data):
  from .enforcers import Enforcer, get_enforcer
 
  covariant = self.covariant or validator.settings.covariant
@@ -541,7 558,7 @@ def preprocess_data(self, validator: typing.Literal["Validator"], data):
 
  return data
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  try:
  input_type = type(data)
 
@@ -619,7 636,7 @@ def __init__(self, data_type, **kwargs):
  enforcer, is_sequence=True, is_container=True, type_var=False, **kwargs
  )
 
- def preprocess_data(self, validator: typing.Literal["Validator"], data):
  def preprocess_data(self, validator: "Validator", data):
  from .enforcers import Enforcer, GenericProxy
 
  try:
@@ -640,7 657,7 @@ def preprocess_data(self, validator: typing.Literal["Validator"], data):
  else:
  return GenericProxy(data)
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  enforcer = data.__enforcer__
  input_type = enforcer.signature
 
@@ -684,7 701,7 @@ class MappingNode(BaseNode):
  def __init__(self, data_type, **kwargs):
  super().__init__(data_type, is_sequence=True, is_container=True, **kwargs)
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  if not isinstance(data, type):
  input_type = type(data)
  else:
@@ -703,7 720,7 @@ def validate_data(self, validator: typing.Literal["Validator"], data, sticky=Fal
  type_name = input_type.__name__
  return dt.ValidationResult(valid=result, data=data, type_name=type_name)
 
- def validate_children(self, validator: typing.Literal["Validator"], propagated_data):
  def validate_children(self, validator: "Validator", propagated_data):
  key_validator = self.children[0]
  value_validator = self.children[1]
 
@@ -734,7 751,7 @@ def validate_children(self, validator: typing.Literal["Validator"], propagated_d
 
  yield children_validation_results
 
- def map_data(self, validator: typing.Literal["Validator"], self_validation_result):
  def map_data(self, validator: "Validator", self_validation_result):
  data = self_validation_result.data
  output = []
  if self_validation_result.valid:
@@ -744,7 761,10 @@ def map_data(self, validator: typing.Literal["Validator"], self_validation_resul
  return output
 
  def reduce_data(
- self, validator: typing.Literal["Validator"], self_validation_result, child_validation_results
  self,
  validator: "Validator",
  self_validation_result,
  child_validation_results,
  ):
  return {result.data[0]: result.data[1] for result in child_validation_results}
 
@@ -804,16 824,19 @@ def __init__(self, forward_ref, **kwargs):
  )
  self.forward_ref = forward_ref
 
- def validate_data(self, validator: typing.Literal["Validator"], data, sticky=False):
  def validate_data(self, validator: "Validator", data, sticky=False):
  return dt.ValidationResult(
  valid=True, data=data, type_name=extract_type_name(data)
  )
 
- def map_data(self, validator: typing.Literal["Validator"], self_validation_result):
  def map_data(self, validator: "Validator", self_validation_result):
  return [self_validation_result.data]
 
  def reduce_data(
- self, validator: typing.Literal["Validator"], self_validation_result, child_validation_result
  self,
  validator: "Validator",
  self_validation_result,
  child_validation_result,
  ):
  return child_validation_result[0].data