change subclassing

Author: bernt-matthias

acclimatise/cli_types.py

@@ -74,34 +74,28 @@ class CliBoolean(CliType):
 
 
 @dataclass(unsafe_hash=True)
-class CliDir(CliType):
+class CliFileSystemType(CliType):
     """
-    Takes a directory path
+    Takes a directory / file path
     """
 
-    pass
-
-
-@dataclass(unsafe_hash=True)
-class CliOutputDir(CliType):
+    output: bool = None
     """
-    Takes a directory path
+    Indicator if it is input or output (None if unknown)
     """
 
-    pass
-
 
 @dataclass(unsafe_hash=True)
-class CliFile(CliType):
+class CliDir(CliFileSystemType):
     """
-    Takes a file path
+    Takes a directory path
     """
 
     pass
 
 
 @dataclass(unsafe_hash=True)
-class CliOutputFile(CliType):
+class CliFile(CliFileSystemType):
     """
     Takes a file path
     """

test/test_type_inference.py

@@ -5,23 +5,25 @@
 
 
 @pytest.mark.parametrize(
-    "string,typ",
-    [("", CliString),
-     ("int", CliInteger),
-     ("size", CliInteger),
-     ("length", CliInteger),
-     ("max", CliInteger),
-     ("min", CliInteger),
-     ("str", CliString),
-     ("float", CliFloat),
-     ("decimal", CliFloat),
-     ("bool", CliBoolean),
-     ("file", CliFile),
-     ("path", CliFile),
-     ("input file", CliFile),
-     ("output file", CliOutputFile),
-     ("folder", CliDir),
-     ("directory", CliDir),
-     ("output directory", CliOutputDir)])
-def test_type_inference(string, typ):
-    assert isinstance(infer_type(string), typ)
+    "string,typ,isoutput",
+    [("", CliString, False),
+     ("int", CliInteger, False),
+     ("size", CliInteger, False),
+     ("length", CliInteger, False),
+     ("max", CliInteger, False),
+     ("min", CliInteger, False),
+     ("str", CliString, False),
+     ("float", CliFloat, False),
+     ("decimal", CliFloat, False),
+     ("bool", CliBoolean, False),
+     ("file", CliFile, False),
+     ("path", CliFile, False),
+     ("input file", CliFile, False),
+     ("output file", CliFile, True),
+     ("folder", CliDir, False),
+     ("directory", CliDir, False),
+     ("output directory", CliDir, True)])
+def test_type_inference(string, typ, isoutput):
+    inferred_type = infer_type(string)
+    assert isinstance(inferred_type, typ)
+    assert not hasattr(inferred_type, "output") or inferred_type.output == isoutput