PICARD-922: Fix inmulti behaviour with multi-values #623
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
Add a test to check that the inmulti function works as expected.
inmulti arguments where evaluated before inmulti was executed, which resulted in strings being passed as arguments, which breaks cases in which the strings in multivalue variables contain the separator used to separate multiple values (see PICARD-922). This commit changes the behaviour of inmulti so arguments are not evaluated before they're passed, so it can extract the argument value as a list and work with that. This should fix PICARD-922
samj1912
requested changes
Feb 12, 2017
picard/script.py
Outdated
| In both cases, it returns true if the resulting list contains ``needle``.""" | ||
|
|
||
| needle = needle.eval(parser) | ||
| if type(text)==ScriptExpression and len(text)==1 and type(text[0])==ScriptVariable: |
There was a problem hiding this comment.
I would prefer using isinstance() here
There was a problem hiding this comment.
Please run the code through a pep8 checker and fix any errors :)
picard/script.py
Outdated
| needle = needle.eval(parser) | ||
| if type(text)==ScriptExpression and len(text)==1 and type(text[0])==ScriptVariable: | ||
| text=text[0] | ||
| if type(text)==ScriptVariable: |
picard/script.py
Outdated
| name = u"~" + text.name[1:] | ||
| else: | ||
| name = text.name | ||
| values=parser.context.getall(name) |
There was a problem hiding this comment.
PEP8, please put spaces around "="
There was a problem hiding this comment.
text not defined? I think you mean haystack.
There was a problem hiding this comment.
Tests seem to be failing because of the above.
|
Please edit the PR title with PICARD-922 and add a link to jira :) |
Add a few empty lines and wrap some lines so they're not so large
The text variable was renamed to haystack except in some lines. This commit fixes this and also fixes some coding style issues.
antlarr
changed the title
Sophist-UK
added a commit
to Sophist-UK/picard
that referenced
this pull request
Apr 29, 2017
This was referenced Apr 29, 2017
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.
inmulti arguments where evaluated before inmulti was executed, which
resulted in strings being passed as arguments, which breaks cases in which
the strings in multivalue variables contain the separator used to separate
multiple values (see PICARD-922).
This commit fixes the behaviour of inmulti so arguments are not evaluated
before they're passed, so it can extract the argument value as a list and
work with that.
This fixes https://tickets.metabrainz.org/browse/PICARD-922