mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-01-29 09:01:54 +08:00
parse yes/no/on/off as string
This commit is contained in:
@@ -27,6 +27,8 @@ from typing import Any
|
|||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
import yaml.nodes
|
import yaml.nodes
|
||||||
|
import yaml.resolver
|
||||||
|
import yaml.constructor
|
||||||
|
|
||||||
from .. import tools
|
from .. import tools
|
||||||
|
|
||||||
@@ -41,6 +43,7 @@ def load_yaml_file(path: str) -> Any:
|
|||||||
raise ValueError(f"Invalid YAML in the file {path!r}:\n{tools.efmt(err)}") from None
|
raise ValueError(f"Invalid YAML in the file {path!r}:\n{tools.efmt(err)}") from None
|
||||||
|
|
||||||
|
|
||||||
|
# =====
|
||||||
class _YamlLoader(yaml.SafeLoader):
|
class _YamlLoader(yaml.SafeLoader):
|
||||||
def __init__(self, yaml_file: IO) -> None:
|
def __init__(self, yaml_file: IO) -> None:
|
||||||
super().__init__(yaml_file)
|
super().__init__(yaml_file)
|
||||||
@@ -52,3 +55,20 @@ class _YamlLoader(yaml.SafeLoader):
|
|||||||
|
|
||||||
|
|
||||||
_YamlLoader.add_constructor("!include", _YamlLoader.include)
|
_YamlLoader.add_constructor("!include", _YamlLoader.include)
|
||||||
|
|
||||||
|
|
||||||
|
# =====
|
||||||
|
def _disable_some_bools() -> None:
|
||||||
|
# https://stackoverflow.com/questions/36463531
|
||||||
|
resolvers = yaml.resolver.Resolver.yaml_implicit_resolvers
|
||||||
|
for key in "oOyYnN":
|
||||||
|
resolvers[key] = [
|
||||||
|
resolver
|
||||||
|
for resolver in resolvers[key]
|
||||||
|
if resolver[0] != "tag:yaml.org,2002:bool"
|
||||||
|
]
|
||||||
|
if len(resolvers) == 0:
|
||||||
|
del resolvers[key]
|
||||||
|
|
||||||
|
|
||||||
|
_disable_some_bools()
|
||||||
|
|||||||
42
testenv/tests/test_yamlconf.py
Normal file
42
testenv/tests/test_yamlconf.py
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
# ========================================================================== #
|
||||||
|
# #
|
||||||
|
# KVMD - The main PiKVM daemon. #
|
||||||
|
# #
|
||||||
|
# Copyright (C) 2018-2021 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
|
# #
|
||||||
|
# This program is free software: you can redistribute it and/or modify #
|
||||||
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or #
|
||||||
|
# (at your option) any later version. #
|
||||||
|
# #
|
||||||
|
# This program is distributed in the hope that it will be useful, #
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||||
|
# GNU General Public License for more details. #
|
||||||
|
# #
|
||||||
|
# You should have received a copy of the GNU General Public License #
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
|
||||||
|
# #
|
||||||
|
# ========================================================================== #
|
||||||
|
|
||||||
|
|
||||||
|
import pathlib
|
||||||
|
import textwrap
|
||||||
|
|
||||||
|
from kvmd.yamlconf.loader import load_yaml_file
|
||||||
|
|
||||||
|
|
||||||
|
# =====
|
||||||
|
def test_load_yaml_file__bools(tmp_path: pathlib.Path) -> None: # type: ignore
|
||||||
|
pobj = tmp_path / "test.yaml"
|
||||||
|
pobj.write_text(textwrap.dedent("""
|
||||||
|
a: true
|
||||||
|
b: false
|
||||||
|
c: yes
|
||||||
|
d: no
|
||||||
|
"""))
|
||||||
|
data = load_yaml_file(str(pobj))
|
||||||
|
assert data["a"] is True
|
||||||
|
assert data["b"] is False
|
||||||
|
assert data["c"] == "yes"
|
||||||
|
assert data["d"] == "no"
|
||||||
Reference in New Issue
Block a user