Browse Source
Update calls to PyYAML.load to PyYAML.load_safe (#269)
fix/jinja2_context_deprecated
sgelis
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with
10 additions and
9 deletions
-
patacrep/build.py
-
patacrep/content/__init__.py
-
patacrep/content/include.py
-
patacrep/songbook/__init__.py
-
patacrep/templates.py
-
test/test_book/test_compilation.py
-
test/test_content/test_content.py
|
|
@ -380,6 +380,6 @@ def config_model(key): |
|
|
|
""" |
|
|
|
model_path = pkg_datapath('templates', 'songbook_model.yml') |
|
|
|
with encoding.open_read(model_path) as model_file: |
|
|
|
data = yaml.load(model_file) |
|
|
|
data = yaml.safe_load(model_file) |
|
|
|
|
|
|
|
return data.get(key, {}) |
|
|
|
|
|
@ -238,7 +238,7 @@ def validate_parser_argument(raw_schema): |
|
|
|
|
|
|
|
Will raise `ContentError` if the schema is not respected. |
|
|
|
""" |
|
|
|
schema = Rx.make_schema(yaml.load(raw_schema)) |
|
|
|
schema = Rx.make_schema(yaml.safe_load(raw_schema)) |
|
|
|
|
|
|
|
def wrap(parse): |
|
|
|
"""Wrap the parse function""" |
|
|
|
|
|
@ -74,7 +74,7 @@ def parse(keyword, config, argument): |
|
|
|
filepath, |
|
|
|
encoding=config['book']['encoding'] |
|
|
|
) as content_file: |
|
|
|
new_content = yaml.load(content_file) |
|
|
|
new_content = yaml.safe_load(content_file) |
|
|
|
except Exception as error: # pylint: disable=broad-except |
|
|
|
new_contentlist.append_error(ContentError( |
|
|
|
keyword="include", |
|
|
|
|
|
@ -26,13 +26,13 @@ def open_songbook(filename): |
|
|
|
|
|
|
|
try: |
|
|
|
with patacrep.encoding.open_read(filename) as songbook_file: |
|
|
|
user_songbook = yaml.load(songbook_file) |
|
|
|
user_songbook = yaml.safe_load(songbook_file) |
|
|
|
if 'encoding' in user_songbook.get('book', []): |
|
|
|
with encoding.open_read( |
|
|
|
filename, |
|
|
|
encoding=user_songbook['book']['encoding'] |
|
|
|
) as songbook_file: |
|
|
|
user_songbook = yaml.load(songbook_file) |
|
|
|
user_songbook = yaml.safe_load(songbook_file) |
|
|
|
except Exception as error: # pylint: disable=broad-except |
|
|
|
raise patacrep.errors.SongbookError(str(error)) |
|
|
|
|
|
|
|
|
|
@ -240,7 +240,8 @@ class TexBookRenderer(Renderer): |
|
|
|
variables[templatename] = {} |
|
|
|
for variables_string in match: |
|
|
|
try: |
|
|
|
variables[templatename].update(yaml.load(variables_string)) |
|
|
|
variables[templatename].update( |
|
|
|
yaml.safe_load(variables_string)) |
|
|
|
except ValueError as exception: |
|
|
|
raise errors.TemplateError( |
|
|
|
exception, |
|
|
|
|
|
@ -166,7 +166,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): |
|
|
|
"""Compile songbook "on the fly": without a physical songbook file.""" |
|
|
|
|
|
|
|
with open(base + ".yaml", mode="r", encoding="utf8") as sbfile: |
|
|
|
sbyaml = yaml.load(sbfile) |
|
|
|
sbyaml = yaml.safe_load(sbfile) |
|
|
|
|
|
|
|
outputdir = os.path.dirname(base) |
|
|
|
outputname = os.path.basename(base) |
|
|
|
|
|
@ -47,7 +47,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): |
|
|
|
"""Test that `base.source` produces the correct file list""" |
|
|
|
sourcename = "{}.source".format(base) |
|
|
|
with open(sourcename, mode="r", encoding="utf8") as sourcefile: |
|
|
|
sbcontent = yaml.load(sourcefile) |
|
|
|
sbcontent = yaml.safe_load(sourcefile) |
|
|
|
|
|
|
|
outputdir = os.path.dirname(base) |
|
|
|
config = cls._generate_config(sbcontent, outputdir, base) |
|
|
@ -60,7 +60,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): |
|
|
|
if not os.path.exists(controlname): |
|
|
|
raise Exception("Missing control:" + str(controlname).replace("'", '"')) |
|
|
|
with open(controlname, mode="r", encoding="utf8") as controlfile: |
|
|
|
controllist = yaml.load(controlfile) |
|
|
|
controllist = yaml.safe_load(controlfile) |
|
|
|
|
|
|
|
self.assertEqual(controllist, sourcelist) |
|
|
|
|
|
|
|