datavault: Fix labrad_urlencode to work with new FlatData type#343
Merged
Conversation
Closed
Contributor
|
FYI, there are still failed datavault tests, although I don't know enough to determine if these relate to #335. |
Contributor
|
test_datavault.py:test_parameters() should have its calls to T.flatten changed to: which will work independent of the number of elements in the FlatData tuple |
Contributor
|
Alternately, assert the individual elements of flat_a and flat_b are equal by name, rather than using tuple unpacking. |
Contributor
Author
|
@ejeffrey, I've fixed the tests. Could you take another look? |
Contributor
|
LGTM |
The FlatData type is a namedtuple that replaces the plain tuple returned by older versions of pylabrad when flattening data. We modify the labrad_urlencode method to use names of the FlatData items if possible, rather than explicitly unpacking the tuple. This lets us maintain compatibility with changes in 0.95.2 which added a third endianness member to the FlatData tuple. Review: @ejeffrey
maffoo
force-pushed
the
u/maffoo/datavault-param-fix
branch
from
f19221c to
cc26d57
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The FlatData type is a namedtuple that replaces the plain tuple returned by older versions of pylabrad when flattening data. We modify the labrad_urlencode method to use names of the FlatData items if possible, rather than explicitly unpacking the tuple. This lets us maintain compatibility with changes in 0.95.2 which added a third endianness member to the FlatData tuple.