Refs #14030 -- Improved expression support for python values #4107
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
|
LGTM, It removes a lot of boilerplate! |
|
Refs #4105 |
| def _parse_expressions(self, *expressions): | ||
| return [ | ||
| arg if hasattr(arg, 'resolve_expression') else ( | ||
| F(arg) if isinstance(arg, six.string_types) else Value(arg) |
There was a problem hiding this comment.
I think we should include six.text_type to isinstance check too.
There was a problem hiding this comment.
No need for that. text_type is a subset of string_types.
Python 3:
>>> six.text_type
<class 'str'>
>>> six.string_types
(<class 'str'>,)Python 2:
>>> six.text_type
<type 'unicode'>
>>> six.string_types
(<type 'basestring'>,)
>>> str.__bases__
(<type 'basestring'>,)
>>> unicode.__bases__
(<type 'basestring'>,)
|
Fine with me for 1.8. |
jarshwah
force-pushed
the
default-expression-args
branch
from
68e4f90
to
e2d6e14
Compare
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.
Parsing non-expressions now only wraps strings in
F()and everything else asValue(). Thanks @charettes for the idea.