Merge

aparse/_handlers.py

@@ -107,13 +107,16 @@ def preprocess_parameter(self, parameter):
         if parameter is not None and self._does_handle(parameter.type):
             default_factory = parameter.default_factory
             if default_factory is not None:
-                _old_default_factory = default_factory
-                def default_factory():
-                    val = _old_default_factory()
-                    if val is not None:
-                        val = str(val)
-                    return val
-            return True, parameter.replace(argument_type=str, default_factory=default_factory)
+                def comp_value_fn(value):
+                    if value is not None:
+                        value = str(value)
+                    return value
+                default_factory = DefaultFactory(
+                    default_factory.factory,
+                    comp_value_fn)
+            return True, parameter.replace(
+                argument_type=str,
+                default_factory=default_factory)
         return False, parameter
 
     def parse_value(self, parameter, value):

aparse/core.py

@@ -36,8 +36,9 @@ class Literal(metaclass=_LiteralMeta):  # type: ignore
 
 
 class DefaultFactory:
-    def __init__(self, factory):
+    def __init__(self, factory, comp_value_fn=None):
         self.factory = factory
+        self._comp_value_fn = comp_value_fn
 
     def __repr__(self):
         return repr(self.factory())
@@ -50,22 +51,23 @@ def __call__(self):
 
     def __eq__(self, other):
         if not isinstance(other, DefaultFactory):
-            return False
+            return self._get_comp_value(self) == other
         return self._get_comp_value(self) == self._get_comp_value(other)
 
-    @staticmethod
-    def _get_comp_value(value):
+    def _get_comp_value(self, value):
+        if self._comp_value_fn is not None:
+            return self._comp_value_fn(value)
         if isinstance(value, DefaultFactory):
             value = value()
         if isinstance(value, (int, str, float, bool)):
             return str(value)
         if value is None:
             return 'None'
         if isinstance(value, (list, tuple, set)):
-            return '[' + ', '.join(sorted(DefaultFactory._get_comp_value(x) for x in value)) + ']'
+            return '[' + ', '.join(sorted(self._get_comp_value(x) for x in value)) + ']'
         if isinstance(value, (dict, OrderedDict)):
-            return '{' + ', '.join(sorted(f'{k}:{DefaultFactory._get_comp_value(v)}' for k, v in value.items())) + '}'
-        return DefaultFactory._get_comp_value(vars(value))
+            return '{' + ', '.join(sorted(f'{k}:{self._get_comp_value(v)}' for k, v in value.items())) + '}'
+        return self._get_comp_value(vars(value))
 
     def __hash__(self):
         return hash(self._get_comp_value(self))