GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-03 06:49:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1134 from taojian-byte/master

Browse Source 
fix: pyyaml 6.0 deprecated load without loader
This commit is contained in:
debugtalk
2022-03-22 16:16:02 +08:00
committed by GitHub
parent bc9681b355 13217b137e
commit df2d981c12
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
httprunner/loader.py
View File

@@ -9,18 +9,12 @@ from typing import Tuple, Dict, Union, Text, List, Callable
import yaml import yaml
from loguru import logger from loguru import logger
from pydantic import ValidationError from pydantic import ValidationError
from yaml.loader import FullLoader
from httprunner import builtin, utils from httprunner import builtin, utils
from httprunner import exceptions from httprunner import exceptions
from httprunner.models import TestCase, ProjectMeta, TestSuite from httprunner.models import TestCase, ProjectMeta, TestSuite
try:
# PyYAML version >= 5.1
# ref: https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation
yaml.warnings({"YAMLLoadWarning": False})
except AttributeError:
pass
project_meta: Union[ProjectMeta, None] = None project_meta: Union[ProjectMeta, None] = None
@@ -30,7 +24,7 @@ def _load_yaml_file(yaml_file: Text) -> Dict:
""" """
with open(yaml_file, mode="rb") as stream: with open(yaml_file, mode="rb") as stream:
try: try:
yaml_content = yaml.load(stream) yaml_content = yaml.load(stream, loader=FullLoader)
except yaml.YAMLError as ex: except yaml.YAMLError as ex:
err_msg = f"YAMLError:\nfile: {yaml_file}\nerror: {ex}" err_msg = f"YAMLError:\nfile: {yaml_file}\nerror: {ex}"
logger.error(err_msg) logger.error(err_msg)