From 3da5e1c88cc7b2793a403f85a3ebce8f86d0fa34 Mon Sep 17 00:00:00 2001 From: Ari Date: Fri, 20 May 2022 11:05:15 -0400 Subject: [PATCH] fixed python issues --- api/setup.py | 1 + api/src/yaml_serializer/__init__.py | 9 +++++---- api/src/yaml_serializer/dumper.py | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/api/setup.py b/api/setup.py index 294fd37..7ac0783 100644 --- a/api/setup.py +++ b/api/setup.py @@ -21,6 +21,7 @@ setuptools.setup( "pre-commit==2.13.0", "vulture==2.3", "types-requests==2.25.6", + "types-PyYAML==6.0.7", "requests==2.27.0", ], }, diff --git a/api/src/yaml_serializer/__init__.py b/api/src/yaml_serializer/__init__.py index 3a83a35..f5f0ffd 100644 --- a/api/src/yaml_serializer/__init__.py +++ b/api/src/yaml_serializer/__init__.py @@ -1,9 +1,10 @@ -import yaml import io from typing import Any, TextIO, Union -from src.yaml_serializer.loader import YamlSafeLoader +import yaml + from src.yaml_serializer.dumper import YamlSafeDumper +from src.yaml_serializer.loader import YamlSafeLoader def dump_yaml(obj: Any) -> str: @@ -16,7 +17,7 @@ def dump_yaml(obj: Any) -> str: str """ stream = io.StringIO() - yaml.dump( + yaml.dump( # nosec obj, stream, default_flow_style=False, @@ -37,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]: Returns: List[dict, list] """ - return yaml.load(yaml_stream, Loader=YamlSafeLoader) + return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec diff --git a/api/src/yaml_serializer/dumper.py b/api/src/yaml_serializer/dumper.py index 706708a..f61596d 100644 --- a/api/src/yaml_serializer/dumper.py +++ b/api/src/yaml_serializer/dumper.py @@ -11,6 +11,6 @@ class YamlSafeDumper(yaml.SafeDumper): pass -YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) -YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) -YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) +YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore +YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore +YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore