Skip to content

Commit 198d874

Browse files
committed
fix(test): improve test support and remove deprecated warning
1 parent b35c5e2 commit 198d874

19 files changed

Lines changed: 127 additions & 134 deletions

README.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Usage
1818

1919
services:
2020
fake:
21-
class: tests.ioc.service.Fake
21+
class: tests.ioc_test.service.Fake
2222
arguments:
2323
- "%foo.bar%"
2424
kargs:
@@ -28,12 +28,12 @@ Usage
2828
- [ set_ok, [ true ], {arg2: "arg"} ]
2929

3030
foo:
31-
class: tests.ioc.service.Foo
31+
class: tests.ioc_test.service.Foo
3232
arguments: ["@fake", "#@weak_reference"]
3333
kargs: {}
3434

3535
weak_reference:
36-
class: tests.ioc.service.WeakReference
36+
class: tests.ioc_test.service.WeakReference
3737

3838

3939
Then to use and access a service just do

docs/references/bootstraping.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Now you can create a ``services.yml`` containing services definitions:
4343
services:
4444
my.service:
4545
class: module.ClassName
46-
arg: [arg1, @my.second.service]
46+
arguments: [arg1, "@my.second.service"]
4747
kwargs:
4848
api_key: '%external.service.api_key%'
4949
app_name: '%app.name%'

docs/references/extension.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ and to use it:
5757
5858
app = container.get('ioc.extra.flask.app')
5959
60-
__name__ == __main__:
60+
if __name__ == '__main__':
6161
app.run()
6262
6363
Going further

ioc/__init__.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717
# Import the build function directly
1818
from ioc.helper import build
1919

20-
# Make helper and misc modules available
21-
# def __getattr__(name):
22-
# if name == 'helper':
23-
# from ioc import helper
24-
# return helper
25-
# elif name == 'misc':
26-
# from ioc import misc
27-
# return misc
28-
# raise AttributeError(f"module 'ioc' has no attribute '{name}'")
20+
__all__ = [
21+
'build',
22+
]

ioc/helper.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
import ioc.loader
1919
import logging
2020

21-
# Import helper classes and functions from misc for compatibility
22-
from .misc import Dict, deepcopy, get_keys, is_iterable, is_scalar # noqa: F401
23-
24-
# Make these available at the module level
25-
__all__ = ['build', 'Dict', 'deepcopy', 'get_keys', 'is_iterable', 'is_scalar']
26-
27-
2821
def build(files: list[str], logger: Optional[logging.Logger] = None, parameters: Optional[dict[str, Any]] = None) -> Any:
2922

3023
if not logger:

ioc/loader.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@ def support(self, file: str) -> bool:
3737

3838
def load(self, file: str, container_builder: ContainerBuilder) -> None:
3939

40+
content = None
41+
with open(file, 'r', encoding='utf-8') as f:
42+
content = f.read()
43+
4044
try:
41-
data = yaml.load(open(file).read(), OrderedDictYAMLLoader)
45+
data = yaml.load(content, OrderedDictYAMLLoader)
4246
except yaml.scanner.ScannerError as e:
4347
raise ioc.exceptions.LoadingError("file %s, \nerror: %s" % (file, e))
4448

tests/fixtures/services.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
parameters:
22
foo.bar: argument 1
33
foo.foo: "the %foo.bar%"
4-
foo.class: "tests.ioc.service.Foo"
4+
foo.class: "tests.ioc_test.service.Foo"
55

66
services:
77
fake:
8-
class: tests.ioc.service.Fake
8+
class: tests.ioc_test.service.Fake
99
arguments:
1010
- "%foo.bar%"
1111
kargs:
@@ -23,13 +23,13 @@ services:
2323
- []
2424

2525
weak_reference:
26-
class: tests.ioc.service.WeakReference
26+
class: tests.ioc_test.service.WeakReference
2727

2828
method_reference:
29-
class: tests.ioc.service.Fake
29+
class: tests.ioc_test.service.Fake
3030
arguments:
3131
- "@fake#set_ok"
3232

3333
abstract_service:
34-
class: tests.ioc.service.Fake
35-
abstract: true
34+
class: tests.ioc_test.service.Fake
35+
abstract: true

0 commit comments

Comments
 (0)