Skip to content

Commit 7a0ccf9

Browse files
author
Maximilian Sander
committed
Address some code style issues
1 parent 9ca6624 commit 7a0ccf9

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

src/datamodel_code_generator/__init__.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
PythonVersionMin,
3131
)
3232
from datamodel_code_generator.parser import DefaultPutDict, LiteralType
33-
from datamodel_code_generator.util import SafeLoader, get_SafeLoader
33+
from datamodel_code_generator.util import SafeLoader, get_safeloader
3434

3535
MIN_VERSION: Final[int] = 9
3636
MAX_VERSION: Final[int] = 13
@@ -46,12 +46,14 @@
4646

4747
DEFAULT_BASE_CLASS: str = "pydantic.BaseModel"
4848

49-
g_extend_yaml_scientifc_notation = False
50-
def get_SafeLoader_(SafeLoader):
51-
return get_SafeLoader(SafeLoader, g_extend_yaml_scientifc_notation)
49+
g_extend_yaml_scientifc_notation: bool = False
50+
51+
def get_safeloader_wrapper(safeloader: type[SafeLoader]) -> type[SafeLoader]:
52+
return get_safeloader(safeloader, extend_yaml_scientifc_notation=g_extend_yaml_scientifc_notation)
53+
5254

5355
def load_yaml(stream: str | TextIO) -> Any:
54-
return yaml.load(stream, Loader=get_SafeLoader_(SafeLoader)) # noqa: S506
56+
return yaml.load(stream, Loader=get_safeloader_wrapper(SafeLoader)) # noqa: S506
5557

5658

5759
def load_yaml_from_path(path: Path, encoding: str) -> Any:

src/datamodel_code_generator/util.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,30 @@ def load_toml(path: Path) -> dict[str, Any]:
3535
with path.open("rb") as f:
3636
return load_tomllib(f)
3737

38-
def get_SafeLoader(SafeLoader, extend_yaml_scientifc_notation=False):
39-
SafeLoaderTemp = copy.deepcopy(SafeLoader)
40-
SafeLoaderTemp.yaml_constructors = copy.deepcopy(SafeLoader.yaml_constructors)
41-
SafeLoaderTemp.add_constructor(
38+
def get_safeloader(safeloader: type[SafeLoader], *, extend_yaml_scientifc_notation: bool) -> type[SafeLoader]:
39+
safeloadertemp = copy.deepcopy(safeloader)
40+
safeloadertemp.yaml_constructors = copy.deepcopy(safeloader.yaml_constructors)
41+
safeloadertemp.add_constructor(
4242
"tag:yaml.org,2002:timestamp",
43-
SafeLoaderTemp.yaml_constructors["tag:yaml.org,2002:str"],
43+
safeloadertemp.yaml_constructors["tag:yaml.org,2002:str"],
4444
)
4545
if extend_yaml_scientifc_notation is True:
46-
SafeLoaderTemp.add_implicit_resolver(
47-
u'tag:yaml.org,2002:float',
48-
re.compile(u'''^(?:
46+
safeloadertemp.add_implicit_resolver(
47+
"tag:yaml.org,2002:float",
48+
re.compile(
49+
r"""^(?:
4950
[-+]?(?:[0-9][0-9_]*)\\.[0-9_]*(?:[eE][-+]?[0-9]+)?
5051
|[-+]?(?:[0-9][0-9_]*)(?:[eE][-+]?[0-9]+)
5152
|\\.[0-9_]+(?:[eE][-+][0-9]+)?
5253
|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*
5354
|[-+]?\\.(?:inf|Inf|INF)
54-
|\\.(?:nan|NaN|NAN))$''', re.X),
55-
list(u'-+0123456789.')
55+
|\\.(?:nan|NaN|NAN))$""",
56+
re.VERBOSE,
57+
),
58+
list("-+0123456789."),
5659
)
57-
return SafeLoaderTemp
60+
return safeloadertemp
61+
5862

5963
Model = TypeVar("Model", bound=_BaseModel)
6064

0 commit comments

Comments
 (0)