[WIP] Make ManifestSchema compatible with marshmallow >= 3 #3296
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
StefanBruens
force-pushed
the
marshmallow3_support
branch
2 times, most recently
from
9dfc3fd to
eb42f2c
Compare
Instead of suppressing the exception, checking for an error and raising a PlatformIOException, directly raise the PlatformIOException from handle_error(). Add a small wrapper for Schema.load() to cover the the return value difference ((data, error) tuple vs data only). For more information, see https://marshmallow.readthedocs.io/en/stable/upgrading.html
StefanBruens
force-pushed
the
marshmallow3_support
branch
from
eb42f2c to
ec931bf
Compare
|
Could you fix a PR to make it compatible between Python 2 and Python 3? |
StefanBruens
changed the title
|
Supporting both Python2 and 3 is actually a little bit more work, but I am on it ... |
hmaarrfk
reviewed
Dec 14, 2019
|
|
||
| from platformio.package.exception import ManifestValidationError | ||
| from platformio.util import memoized | ||
|
|
||
|
|
||
| class StrictSchema(Schema): | ||
| def handle_error(self, error, data): | ||
| def handle_error(self, error, data, *, _many, **_kwargs): |
There was a problem hiding this comment.
Python 2.7 doesn't have keyword only arguments
https://www.python.org/dev/peps/pep-3102/
Suggested change
| def handle_error(self, error, data, *, _many, **_kwargs): | |
| def handle_error(self, error, data, _many, **_kwargs): |
hmaarrfk
reviewed
Dec 14, 2019
| data, _ = self.load(manifest) | ||
| return data | ||
|
|
||
| def handle_error(self, error, data, *, _many, **_kwargs): |
There was a problem hiding this comment.
Suggested change
| def handle_error(self, error, data, *, _many, **_kwargs): | |
| def handle_error(self, error, data, _many, **_kwargs): |
No keyword only arguments in Python 2.7
|
Sorry for jumping in, just did a quick browse and noticed at least one feature that isn't available in Python 2.7. |
hmaarrfk
pushed a commit
to hmaarrfk/platformio-core
that referenced
this pull request
Dec 29, 2019
1 task
5 tasks
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.
Instead of suppressing the exception, checking for an error and raising
a PlatformIOException, directly raise the PlatformIOException from
handle_error().
Add a small wrapper for Schema.load() to cover the the return value
difference ((data, error) tuple vs data only).
For more information, see
https://marshmallow.readthedocs.io/en/stable/upgrading.html