dataconf 3.6.0__tar.gz → 3.7.0__tar.gz

{dataconf-3.6.0 → dataconf-3.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dataconf
-Version: 3.6.0
+Version: 3.7.0
 Summary: Simple dataclasses configuration management for Python with hocon/json/yaml/properties/env-vars/dict support.
 Home-page: https://github.com/zifeo/dataconf
 License: MPL-2.0

{dataconf-3.6.0 → dataconf-3.7.0}/dataconf/main.py

@@ -45,13 +45,14 @@ class Multi:
         self.kwargs = kwargs
 
     def env(self, prefix: str, **kwargs) -> "Multi":
-        self.strict = False
         data = env_vars_parse(prefix, os.environ)
-        return self.dict(data, **kwargs)
+        strict = kwargs.pop("strict", False)
+        return self.dict(data, strict=strict, **kwargs)
 
     def dict(self, obj: Dict[str, Any], **kwargs) -> "Multi":
         conf = ConfigFactory.from_dict(obj)
-        return Multi(self.confs + [conf], self.strict, **kwargs)
+        strict = kwargs.pop("strict", self.strict)
+        return Multi(self.confs + [conf], strict, **kwargs)
 
     def string(self, s: str, loader: str = HOCON, **kwargs) -> "Multi":
         if loader == YAML:

{dataconf-3.6.0 → dataconf-3.7.0}/dataconf/utils.py

@@ -42,6 +42,21 @@ if PY310up:
 
 NoneType = type(None)
 
+_BOOL_TRUE = {"true", "1", "yes", "on", "t", "y"}
+_BOOL_FALSE = {"false", "0", "no", "off", "f", "n"}
+
+
+def __parse_bool(value: Any):
+    if isinstance(value, bool):
+        return value
+    if isinstance(value, str):
+        normalised = value.strip().lower()
+        if normalised in _BOOL_TRUE:
+            return True
+        if normalised in _BOOL_FALSE:
+            return False
+    return None
+
 
 def __parse_type(value: Any, clazz: Type, path: str, check: bool):
     try:
@@ -208,14 +223,14 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
         )
 
     if clazz is bool:
-        if not strict and value is not None:
-            try:
-                value = bool(value)
-            except ValueError:
-                pass
-        return __parse_type(value, clazz, path, isinstance(value, bool))
+        parsed = __parse_bool(value)
+        if parsed is not None:
+            return parsed
+        return __parse_type(value, clazz, path, False)
 
     if clazz is int:
+        if isinstance(value, bool):
+            return __parse_type(value, clazz, path, False)
         if not strict and value is not None:
             try:
                 value = int(value)
@@ -224,6 +239,8 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
         return __parse_type(value, clazz, path, isinstance(value, int))
 
     if clazz is float:
+        if isinstance(value, bool):
+            return __parse_type(value, clazz, path, False)
         if not strict and value is not None:
             try:
                 value = float(value)
@@ -243,7 +260,7 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
         return value
 
     if isclass(clazz) and (issubclass(clazz, Enum) or issubclass(clazz, IntEnum)):
-        if isinstance(value, int):
+        if isinstance(value, int) and not isinstance(value, bool):
             return clazz.__call__(value)
         elif issubclass(clazz, str):
             return clazz(value)

{dataconf-3.6.0 → dataconf-3.7.0}/dataconf/version.py

@@ -1,6 +1,6 @@
 import sys
 
-__version__ = "3.6.0"
+__version__ = "3.7.0"
 
 PY310up = sys.version_info >= (3, 10)
 PY311up = sys.version_info >= (3, 11)

{dataconf-3.6.0 → dataconf-3.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dataconf"
-version = "3.6.0"
+version = "3.7.0"
 description = "Simple dataclasses configuration management for Python with hocon/json/yaml/properties/env-vars/dict support."
 authors = []
 license = "MPL-2.0"
@@ -48,7 +48,7 @@ ruff = ">=0.12.7"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "3.6.0"
+version = "3.7.0"
 tag_format = "v$major.$minor.$patch$prerelease"
 version_files = [
     "pyproject.toml:version",