fix(import): fix import usage

Author: Thomas Rabaix

Makefile

@@ -1,40 +1,42 @@
 all: build
 
-build: clean
-	pip install build twine
+build-install:
+	uv pip install build twine flake8 sphinx
+
+build: build-install clean
 	rm -rf dist/
-	python -m build
-	twine check dist/*
+	uv run python -m build
+	uv run twine check dist/*
 
-upload-prod: build
+upload-prod: build-install build
 	export TWINE_USERNAME=__token__
-	bash -c 'read -s -p "Enter your Production PyPI token: " TWINE_PASSWORD; echo; export TWINE_PASSWORD; python -m twine upload dist/*'
+	bash -c 'read -s -p "Enter your Production PyPI token: " TWINE_PASSWORD; echo; export TWINE_PASSWORD; uv run twine upload dist/*'
 
-upload-test: build
+upload-test: build-install build
 	export TWINE_USERNAME=__token__
-	bash -c 'read -s -p "Enter your Test PyPI token: " TWINE_PASSWORD; echo; export TWINE_PASSWORD; python -m twine upload --repository testpypi dist/*'
+	bash -c 'read -s -p "Enter your Test PyPI token: " TWINE_PASSWORD; echo; export TWINE_PASSWORD; uv run twine upload --repository testpypi dist/*'
 
 clean:
 	rm -rf build/ dist/ *.egg-info/ __pycache__/ .pytest_cache/ .mypy_cache/
 	find . -type f -name "*.pyc" -delete
 	find . -type d -name "__pycache__" -delete
 
-test:
-	flake8 ioc/ tests/
-	python -m unittest discover -s tests -p "test_*.py"
-	sphinx-build -nW -b html -d docs/_build/doctrees docs docs/_build/html
+test: build-install
+	uv run flake8 ioc/ tests/
+	uv run python -m unittest discover -s tests -p "test_*.py"
+	LC_ALL=C.UTF-8 LANG=C.UTF-8 uv run sphinx-build -nW -b html -d docs/_build/doctrees docs docs/_build/html
 
-test-strict:
-	flake8 ioc/ tests/
-	mypy ioc/
-	python -m unittest discover -s tests -p "test_*.py"
-	sphinx-build -nW -b html -d docs/_build/doctrees docs docs/_build/html
+test-strict: build-install
+	uv run flake8 ioc/ tests/
+	uv run mypy ioc/
+	uv run python -m unittest discover -s tests -p "test_*.py"
+	LC_ALL=C.UTF-8 LANG=C.UTF-8 uv run sphinx-build -nW -b html -d docs/_build/doctrees docs docs/_build/html
 
-lint:
-	flake8 ioc/ tests/
+lint: build-install
+	uv run flake8 ioc/ tests/
 
-typecheck:
-	mypy ioc/
+typecheck: build-install
+	uv run mypy ioc/
 
-unittest:
-	python -m unittest discover -s tests -p "test_*.py" -v
+unittest: build-install
+	uv run python -m unittest discover -s tests -p "test_*.py" -v

ioc/loader.py

@@ -17,19 +17,16 @@
 import yaml
 
 from ioc.component import Definition, Reference, WeakReference, ContainerBuilder
-import ioc.helper
 import ioc.exceptions
-from . import misc
-
-from .misc import OrderedDictYAMLLoader
+import ioc.misc
 
 class Loader(object):
-    def fix_config(self, config: dict[str, Any]) -> 'ioc.helper.Dict':
+    def fix_config(self, config: dict[str, Any]) -> 'ioc.misc.Dict':
         for key, value in config.items():
             if isinstance(value, dict):
                 config[key] = self.fix_config(value)
 
-        return ioc.helper.Dict(config)
+        return ioc.misc.Dict(config)
 
 class YamlLoader(Loader):
     def support(self, file: str) -> bool:
@@ -42,7 +39,7 @@ def load(self, file: str, container_builder: ContainerBuilder) -> None:
             content = f.read()
 
         try:
-            data = yaml.load(content, OrderedDictYAMLLoader)
+            data = yaml.load(content, ioc.misc.OrderedDictYAMLLoader)
         except yaml.scanner.ScannerError as e:
             raise ioc.exceptions.LoadingError("file %s, \nerror: %s" % (file, e))
 
@@ -109,23 +106,23 @@ def load(self, file: str, container_builder: ContainerBuilder) -> None:
                 container_builder.add(id, definition)
 
     def set_reference(self, value: Any) -> Any:
-        if misc.is_scalar(value) and value[0:1] == '@':
+        if ioc.misc.is_string(value) and value[0:1] == '@':
             if '#' in value:
                 id, method = value.split("#")
                 return Reference(id[1:], method)
 
             return Reference(value[1:])
 
-        if misc.is_scalar(value) and value[0:2] == '#@':
+        if ioc.misc.is_string(value) and value[0:2] == '#@':
             return WeakReference(value[2:])
 
-        if misc.is_iterable(value):
+        if ioc.misc.is_iterable(value):
             return self.set_references(value)
 
         return value
 
     def set_references(self, arguments: Union[list[Any], dict[str, Any]]) -> Union[list[Any], dict[str, Any]]:
-        for pos in misc.get_keys(arguments):
+        for pos in ioc.misc.get_keys(arguments):
             arguments[pos] = self.set_reference(arguments[pos])
 
         return arguments

ioc/misc.py

@@ -64,7 +64,7 @@ def deepcopy(value: Any) -> Any:
 
     return value
 
-def is_scalar(value: Any) -> bool:
+def is_string(value: Any) -> bool:
     return isinstance(value, (str))
 
 def is_iterable(value: Any) -> bool: