Merge pull request #12 from thombashi/fix-logic-issues

Fix logic issues in type checking and conversion functions

Author: thombashi

typepy/checker/_common.py

@@ -7,7 +7,7 @@
 
 
 def isstring(value):
-    return isinstance(value, (str,) + (str, bytes))
+    return isinstance(value, (str, bytes))
 
 
 def isinf(value):

typepy/checker/_dictionary.py

@@ -10,7 +10,7 @@ def is_instance(self):
         return isinstance(self._value, dict)
 
     def is_valid_after_convert(self, converted_value):
-        return isinstance(converted_value, dict) and converted_value
+        return isinstance(converted_value, dict) and bool(converted_value)
 
 
 class DictionaryTypeCheckerStrictLevel1(DictionaryTypeCheckerStrictLevel0):

typepy/checker/_integer.py

@@ -55,7 +55,7 @@ def is_exclude_instance(self):
 
 class IntegerTypeCheckerStrictLevel2(IntegerTypeCheckerStrictLevel1):
     def is_exclude_instance(self):
-        return isinstance(self._value, (str,) + (bool, float, Decimal))
+        return isinstance(self._value, (str, bool, float, Decimal))
 
 
 _factory = CheckerFactory(

typepy/checker/_list.py

@@ -11,7 +11,7 @@ def is_instance(self):
         return isinstance(self._value, list)
 
     def is_valid_after_convert(self, converted_value):
-        return isinstance(converted_value, list) and converted_value
+        return isinstance(converted_value, list) and bool(converted_value)
 
     def is_exclude_instance(self):
         return isstring(self._value)

typepy/converter/_bool.py

@@ -36,9 +36,9 @@ def __strict_strtobool(value):
         except AttributeError:
             raise ValueError(f"invalid value '{str(value)}'")
 
-        if lower_text in ["true"]:
+        if lower_text == "true":
             return True
-        elif lower_text in ["false"]:
+        elif lower_text == "false":
             return False
 
         raise ValueError(f"invalid value '{str(value)}'")

typepy/converter/_bytes.py

@@ -8,4 +8,4 @@
 
 class BytesConverter(AbstractValueConverter):
     def force_convert(self):
-        raise TypeConversionError("not inmplemented")
+        raise TypeConversionError("not implemented")

typepy/converter/_ipaddress.py

@@ -25,6 +25,4 @@ def force_convert(self):
             except ValueError:
                 pass
 
-        raise TypeConversionError(
-            f"failed to force_convert to dictionary: type={type(self._value)}"
-        )
+        raise TypeConversionError(f"failed to force_convert to ipaddress: type={type(self._value)}")

typepy/converter/_string.py

@@ -16,5 +16,4 @@ def force_convert(self):
 
 
 class NullStringConverter(StringConverter):
-    def force_convert(self):
-        return super().force_convert()
+    pass