python: Fix yaml.load warnings

Since pyyaml 5.1 yaml.load without specifing loader is deprecated
Details: https://msg.pyyaml.org/load

To keep code compatible with older versions of pyyaml
and keep best perfomance CLoader with fallback to Loader is used.
This commit is contained in:
Sergei Silnov
2019-06-28 16:36:20 +02:00
committed by bot
parent c27fd32fbe
commit c57dfbc0b8
7 changed files with 45 additions and 9 deletions
+9 -3
View File
@@ -8,6 +8,11 @@ import subprocess
from copy import deepcopy
import CreateSectionTable
try:
from yaml import CLoader as Loader
except ImportError:
from yaml import Loader as Loader
TEST_CASE_PATTERN = {
"initial condition": "UTINIT1",
"SDK": "ESP32_IDF",
@@ -50,9 +55,10 @@ class Parser(object):
self.unit_jobs = {}
self.file_name_cache = {}
self.idf_path = idf_path
self.tag_def = yaml.load(open(os.path.join(idf_path, self.TAG_DEF_FILE), "r"))
self.module_map = yaml.load(open(os.path.join(idf_path, self.MODULE_DEF_FILE), "r"))
self.config_dependencies = yaml.load(open(os.path.join(idf_path, self.CONFIG_DEPENDENCY_FILE), "r"))
self.tag_def = yaml.load(open(os.path.join(idf_path, self.TAG_DEF_FILE), "r"), Loader=Loader)
self.module_map = yaml.load(open(os.path.join(idf_path, self.MODULE_DEF_FILE), "r"), Loader=Loader)
self.config_dependencies = yaml.load(open(os.path.join(idf_path, self.CONFIG_DEPENDENCY_FILE), "r"),
Loader=Loader)
# used to check if duplicated test case names
self.test_case_names = set()
self.parsing_errors = []