[FIX] yaml: Specify loader to YAML constructors #28
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spenced
reviewed
Apr 26, 2019
odoo/tools/yaml_tag.py
Outdated
| for tag, constructor in constructors: | ||
| try: | ||
| # pyYAML v5.1 requires a loader to be set and does not include a default for add_constructor. | ||
| yaml.add_constructor(tag, constructor, Loader=yaml.FullLoader) |
There was a problem hiding this comment.
Restricting the code in the try block to just determining if yaml.FullLoader is available eliminates any AttributeError escaping from the add_constructor call as a potential reason for executing the except block. The add_constructor with Loader can then be in an else.
samueljsb
force-pushed
the
task/3958
branch
2 times, most recently
from
570f3cd to
2f3d550
Compare
pyYAML 5.1 is now the distro version. This introduces the FullLoader as the default loader used with yaml.load(…), however the default loader for yaml.add_constructor(…) has not been updated (This is a known issue: yaml/pyyaml#274). This commit specifies the loader to be used when adding constructors, using the FullLoader if it exists and the older Loader if not (i.e. depending on which version of pyYAML is installed). Task: 3958 Signed-off-by: Samuel Searles-Bryant <[email protected]>
samueljsb
changed the title
spenced
approved these changes
Apr 26, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pyYAML 5.1 is now the distro version. This introduces the FullLoader as the default loader used with
yaml.load(…), however the default loader foryaml.add_constructor(…)has not been updated (this is a known issue: yaml/pyyaml#274).This commit specifies the loader to be used when adding constructors, using the FullLoader if it exists and the older Loader if not (i.e. depending on which version of pyYAML is installed).
Task: 3958