python-simpleconf 0.8.0__tar.gz → 0.8.2__tar.gz

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-simpleconf
-Version: 0.8.0
+Version: 0.8.2
 Summary: Simple configuration management with python.
 License: MIT
 License-File: LICENSE

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "python-simpleconf"
-version = "0.8.0"
+version = "0.8.2"
 description = "Simple configuration management with python."
 authors = [ "pwwang <pwwang@pwwang.com>",]
 license = "MIT"

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/__init__.py

@@ -1,3 +1,3 @@
 from .config import Config, ProfileConfig
 
-__version__ = "0.8.0"
+__version__ = "0.8.2"

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/loaders/__init__.py

@@ -52,7 +52,7 @@ class Loader(ABC):
     async def _a_exists(self, conf: str | Path, ignore_exist: bool) -> bool:
         """Asynchronously check if the configuration file exists"""
         path = self.__class__._convert_path(conf)
-        exists = await path.a_exists()
+        exists = await path.a_exists()  # type: ignore[attr-defined]
         if not ignore_exist and not exists:
             raise FileNotFoundError(f"{conf} does not exist")
         return exists
@@ -131,4 +131,4 @@ class NoConvertingPathMixin(ABC):
 
     async def a_loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:
         """Asynchronously load the configuration from a toml file"""
-        return self.loading(conf, ignore_nonexist)
+        return self.loading(conf, ignore_nonexist)  # type: ignore[attr-defined]

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/loaders/dict.py

@@ -19,7 +19,7 @@ class DictLoader(Loader):
         return conf
 
 
-class DictsLoader(NoConvertingPathMixin, DictLoader):
+class DictsLoader(NoConvertingPathMixin, DictLoader):  # type: ignore[misc]
     """Dict string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/loaders/env.py

@@ -44,7 +44,9 @@ class EnvLoader(Loader):
         if not self._exists(conf, ignore_nonexist):
             return {}
 
-        return dotenv.main.DotEnv(conf).dict()
+        conf = self.__class__._convert_path(conf)
+        content = conf.read_text()  # so that cloud paths work
+        return dotenv.dotenv_values(stream=io.StringIO(content))
 
     async def a_loading(self, conf, ignore_nonexist):
         """Asynchronously load the configuration from a .env file"""
@@ -59,7 +61,9 @@ class EnvLoader(Loader):
         if not await self._a_exists(conf, ignore_nonexist):
             return {}
 
-        return dotenv.main.DotEnv(conf).dict()
+        conf = self.__class__._convert_path(conf)
+        content = await conf.a_read_text()  # so that cloud paths work
+        return dotenv.dotenv_values(stream=io.StringIO(content))
 
     @classmethod
     def _convert_with_profiles(  # type: ignore[override]
@@ -79,7 +83,7 @@ class EnvLoader(Loader):
         return cast(out, cls.CASTERS)
 
 
-class EnvsLoader(NoConvertingPathMixin, EnvLoader):
+class EnvsLoader(NoConvertingPathMixin, EnvLoader):  # type: ignore[misc]
     """Env string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool = False) -> Dict[str, Any]:

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/loaders/ini.py

@@ -45,7 +45,10 @@ class IniLoader(Loader):
         if not self._exists(conf, ignore_nonexist):
             return {"default": {}}
 
-        return iniconfig.IniConfig(conf).sections
+        conf = self.__class__._convert_path(conf)
+        content = conf.read_text()
+
+        return iniconfig.IniConfig(conf, content).sections
 
     async def a_loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:
         """Asynchronously load the configuration from an ini-like file"""
@@ -60,7 +63,10 @@ class IniLoader(Loader):
         if not await self._a_exists(conf, ignore_nonexist):
             return {"default": {}}
 
-        return iniconfig.IniConfig(conf).sections
+        conf = self.__class__._convert_path(conf)
+        content = await conf.a_read_text()
+
+        return iniconfig.IniConfig(conf, content).sections
 
     @classmethod
     def _convert(  # type: ignore[override]
@@ -100,7 +106,7 @@ class IniLoader(Loader):
         return out
 
 
-class InisLoader(NoConvertingPathMixin, IniLoader):
+class InisLoader(NoConvertingPathMixin, IniLoader):  # type: ignore[misc]
     """Ini-like string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/loaders/json.py

@@ -16,8 +16,9 @@ class JsonLoader(Loader):
         if not self._exists(conf, ignore_nonexist):
             return {}
 
-        with open(conf) as f:
-            return json.load(f)
+        conf = self.__class__._convert_path(conf)
+        content = conf.read_text()
+        return json.loads(content)
 
     async def a_loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:
         """Asynchronously load the configuration from a json file"""
@@ -32,14 +33,12 @@ class JsonLoader(Loader):
         if not await self._a_exists(conf, ignore_nonexist):
             return {}
 
-        async with self.__class__._convert_path(conf).a_open() as f:
-            content = await f.read()
-            if isinstance(content, bytes):  # pragma: no cover
-                content = content.decode()
-            return json.loads(content)
+        conf = self.__class__._convert_path(conf)
+        content = await conf.a_read_text()
+        return json.loads(content)
 
 
-class JsonsLoader(NoConvertingPathMixin, JsonLoader):
+class JsonsLoader(NoConvertingPathMixin, JsonLoader):  # type: ignore[misc]
     """Json string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/loaders/osenv.py

@@ -18,7 +18,7 @@ from ..caster import (
 )
 
 
-class OsenvLoader(NoConvertingPathMixin, Loader):
+class OsenvLoader(NoConvertingPathMixin, Loader):  # type: ignore[misc]
     """Environment variable loader"""
 
     CASTERS = [

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/loaders/toml.py

@@ -27,12 +27,13 @@ class TomlLoader(Loader):
         if not self._exists(conf, ignore_nonexist):
             return {}
 
-        if toml.__name__ in ("tomli", "tomllib"):  # pragma: no cover
-            with open(conf, "rb") as f:
-                return toml.load(f)
-
-        with open(conf, "r") as f:  # rtoml
-            return toml.load(f)
+        conf = self.__class__._convert_path(conf)
+        content = conf.read_bytes()
+        try:
+            return toml.loads(content)
+        except TypeError:
+            content = content.decode()
+            return toml.loads(content)
 
     async def a_loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:
         """Asynchronously load the configuration from a toml file"""
@@ -47,16 +48,16 @@ class TomlLoader(Loader):
         if not await self._a_exists(conf, ignore_nonexist):
             return {}
 
-        async with self.__class__._convert_path(conf).a_open("rb") as f:
-            content = await f.read()
-            try:
-                return toml.loads(content)
-            except TypeError:
-                content = content.decode()
-                return toml.loads(content)
+        conf = self.__class__._convert_path(conf)
+        content = await conf.a_read_bytes()
+        try:
+            return toml.loads(content)
+        except TypeError:
+            content = content.decode()
+            return toml.loads(content)
 
 
-class TomlsLoader(NoConvertingPathMixin, TomlLoader):
+class TomlsLoader(NoConvertingPathMixin, TomlLoader):  # type: ignore[misc]
     """Toml string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:

{python_simpleconf-0.8.0 → python_simpleconf-0.8.2}/simpleconf/loaders/yaml.py

@@ -18,8 +18,9 @@ class YamlLoader(Loader):
         if not self._exists(conf, ignore_nonexist):
             return {}
 
-        with open(conf) as f:
-            return yaml.load(f, Loader=yaml.FullLoader)
+        conf = self.__class__._convert_path(conf)
+        content = conf.read_text()
+        return yaml.load(content, Loader=yaml.FullLoader)
 
     async def a_loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:
         """Asynchronously load the configuration from a yaml file"""
@@ -34,14 +35,12 @@ class YamlLoader(Loader):
         if not await self._a_exists(conf, ignore_nonexist):
             return {}
 
-        async with self.__class__._convert_path(conf).a_open() as f:
-            content = await f.read()
-            if isinstance(content, bytes):  # pragma: no cover
-                content = content.decode()
-            return yaml.load(content, Loader=yaml.FullLoader)
+        conf = self.__class__._convert_path(conf)
+        content = await conf.a_read_text()
+        return yaml.load(content, Loader=yaml.FullLoader)
 
 
-class YamlsLoader(NoConvertingPathMixin, YamlLoader):
+class YamlsLoader(NoConvertingPathMixin, YamlLoader):  # type: ignore[misc]
     """Yaml string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]: