Minor fixes and cleanup #356
Merged
Conversation
This file contains hidden or 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
'yaml.load' should not be used any longer without providing a specific loader. The instances where a specific loader is not required were now replaced with the 'yaml.safe_load' method that uses the 'SafeLoader' class by default.
Add a warning when importing odml with an outdated Python version.
Since 'version_info' is available via the odmltools package import, rename it to python_version to clarify the context of this function.
- update README file extension rtf->md - use recursive-include to add odml/resources - add test/resources files
Closes G-Node#353, closes G-Node#250 Use the parser_utils odml_tuple_export function in xmlparser and dict_parser. It is required to properly serialize odml style tuples to XML, JSON and YAML files.
Closes G-Node#354 Also updates the corresponding test.
When loading odml style tuples from a yaml or json file with Python 2, the string containing the tuples is not properly parsed from a unicode string to a list of odml style tuples. With JSON and YAML in Python 3 this conversion works out of the box but to not break Python 2 compatibility already this hotfix is introduced.
achilleas-k
approved these changes
Feb 17, 2020
| import odml.dtypes as typ | ||
|
|
||
|
|
||
| class TestTypes(unittest.TestCase): | ||
|
|
||
| def assertLocalRegExp(self, text, regular_expression): | ||
| """ | ||
| Python 2 is dead and assertRegexpMatches is deprecated and |
There was a problem hiding this comment.
Suggested change
| Python 2 is dead and assertRegexpMatches is deprecated and | |
| Python 2 is **DEAD** and assertRegexpMatches is deprecated and |
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.
This PR introduces a couple of fixes and updates:
yaml.loadcalls and replaces them withyaml.save_load. This also prepares for Python 3.9 compatibility.assertRegexpMatcheswhich is supported in Python 2 but not in Python 3.9 and addsassertRegexinstead which is supported in Python 3.2+ but not in Python 2.warningmodule deprecation warning if the odml library is used with a Python version < 3.6.