ominfra 0.0.0.dev192__py3-none-any.whl → 0.0.0.dev193__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
ominfra/configs.py CHANGED
@@ -1,11 +1,10 @@
1
1
  # ruff: noqa: UP006 UP007
2
2
  # @omlish-lite
3
- import io
4
3
  import json
5
4
  import os.path
6
5
  import typing as ta
7
6
 
8
- from omdev.toml.parser import toml_loads
7
+ from omlish.formats.toml.parser import toml_loads
9
8
  from omlish.lite.check import check
10
9
  from omlish.lite.marshal import OBJ_MARSHALER_MANAGER
11
10
  from omlish.lite.marshal import ObjMarshalerManager
@@ -15,8 +14,6 @@ T = ta.TypeVar('T')
15
14
 
16
15
  ConfigMapping = ta.Mapping[str, ta.Any]
17
16
 
18
- IniConfigSectionSettingsMap = ta.Mapping[str, ta.Mapping[str, ta.Union[str, ta.Sequence[str]]]] # ta.TypeAlias
19
-
20
17
 
21
18
  ##
22
19
 
@@ -103,27 +100,3 @@ def build_config_named_children(
103
100
  seen.add(n)
104
101
 
105
102
  return lst
106
-
107
-
108
- ##
109
-
110
-
111
- def render_ini_config(
112
- settings_by_section: IniConfigSectionSettingsMap,
113
- ) -> str:
114
- out = io.StringIO()
115
-
116
- for i, (section, settings) in enumerate(settings_by_section.items()):
117
- if i:
118
- out.write('\n')
119
-
120
- out.write(f'[{section}]\n')
121
-
122
- for k, v in settings.items():
123
- if isinstance(v, str):
124
- out.write(f'{k}={v}\n')
125
- else:
126
- for vv in v:
127
- out.write(f'{k}={vv}\n')
128
-
129
- return out.getvalue()
@@ -29,7 +29,7 @@ from omlish.os.paths import relative_symlink
29
29
  from omserv.nginx.configs import NginxConfigItems
30
30
  from omserv.nginx.configs import render_nginx_config_str
31
31
 
32
- from ....configs import render_ini_config
32
+ from omlish.formats.ini.sections import render_ini_sections
33
33
  from ..paths.paths import DeployPath
34
34
  from ..tags import DEPLOY_TAG_SEPARATOR
35
35
  from ..tags import DeployApp
@@ -100,7 +100,7 @@ class DeployConfManager:
100
100
 
101
101
  elif isinstance(ac, IniDeployAppConfContent):
102
102
  ini_sections = pcc(ac.sections)
103
- return strip_with_newline(render_ini_config(ini_sections))
103
+ return strip_with_newline(render_ini_sections(ini_sections))
104
104
 
105
105
  elif isinstance(ac, NginxDeployAppConfContent):
106
106
  nginx_items = NginxConfigItems.of(pcc(ac.items))
@@ -6,7 +6,7 @@ import typing as ta
6
6
  from omlish.lite.check import check
7
7
  from omlish.lite.marshal import register_single_field_type_obj_marshaler
8
8
 
9
- from ....configs import IniConfigSectionSettingsMap
9
+ from omlish.formats.ini.sections import IniSectionSettingsMap
10
10
  from ..paths.specs import check_valid_deploy_spec_path
11
11
 
12
12
 
@@ -41,7 +41,7 @@ class JsonDeployAppConfContent(DeployAppConfContent):
41
41
  @register_single_field_type_obj_marshaler('sections')
42
42
  @dc.dataclass(frozen=True)
43
43
  class IniDeployAppConfContent(DeployAppConfContent):
44
- sections: IniConfigSectionSettingsMap
44
+ sections: IniSectionSettingsMap
45
45
 
46
46
 
47
47
  #
@@ -52,7 +52,7 @@ if sys.version_info < (3, 8):
52
52
  ########################################
53
53
 
54
54
 
55
- # ../../../../omdev/toml/parser.py
55
+ # ../../../../omlish/formats/toml/parser.py
56
56
  TomlParseFloat = ta.Callable[[str], ta.Any]
57
57
  TomlKey = ta.Tuple[str, ...]
58
58
  TomlPos = int # ta.TypeAlias
@@ -74,7 +74,6 @@ ExitStackedT = ta.TypeVar('ExitStackedT', bound='ExitStacked')
74
74
 
75
75
  # ../../../configs.py
76
76
  ConfigMapping = ta.Mapping[str, ta.Any]
77
- IniConfigSectionSettingsMap = ta.Mapping[str, ta.Mapping[str, ta.Union[str, ta.Sequence[str]]]] # ta.TypeAlias
78
77
 
79
78
  # ../../../threadworkers.py
80
79
  ThreadWorkerT = ta.TypeVar('ThreadWorkerT', bound='ThreadWorker')
@@ -84,7 +83,7 @@ SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull'] # ta.TypeAlia
84
83
 
85
84
 
86
85
  ########################################
87
- # ../../../../../omdev/toml/parser.py
86
+ # ../../../../../omlish/formats/toml/parser.py
88
87
  # SPDX-License-Identifier: MIT
89
88
  # SPDX-FileCopyrightText: 2021 Taneli Hukkinen
90
89
  # Licensed to PSF under a Contributor Agreement.
@@ -3371,30 +3370,6 @@ def build_config_named_children(
3371
3370
  return lst
3372
3371
 
3373
3372
 
3374
- ##
3375
-
3376
-
3377
- def render_ini_config(
3378
- settings_by_section: IniConfigSectionSettingsMap,
3379
- ) -> str:
3380
- out = io.StringIO()
3381
-
3382
- for i, (section, settings) in enumerate(settings_by_section.items()):
3383
- if i:
3384
- out.write('\n')
3385
-
3386
- out.write(f'[{section}]\n')
3387
-
3388
- for k, v in settings.items():
3389
- if isinstance(v, str):
3390
- out.write(f'{k}={v}\n')
3391
- else:
3392
- for vv in v:
3393
- out.write(f'{k}={vv}\n')
3394
-
3395
- return out.getvalue()
3396
-
3397
-
3398
3373
  ########################################
3399
3374
  # ../../../../journald/messages.py
3400
3375