Skip to content

FIX: loadpkl failed when pklz file contained versioning info #3017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 6, 2019
Merged

FIX: loadpkl failed when pklz file contained versioning info #3017

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52818ea
FIX: loadpkl failed when pklz file contained versioning info
pndni-builder Sep 5, 2019
c6047de
parametrize test (suggested by @effigies)
pndni-builder Sep 5, 2019
56ab01e
remove versioning option from loadpkl
pndni-builder Sep 5, 2019
a86d140
Revert "remove versioning option from loadpkl"
pndni-builder Sep 5, 2019
d3a15e9
test versioning in loadpkl
pndni-builder Sep 5, 2019
bbc696f
move loadpkl tests to proper location
pndni-builder Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions nipype/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from nipype import utils


def test_pickle(tmp_path):
testobj = 'iamateststr'
pickle_fname = str(tmp_path / 'testpickle.pklz')
utils.filemanip.savepkl(pickle_fname, testobj)
outobj = utils.filemanip.loadpkl(pickle_fname)
assert outobj == testobj


def test_pickle_versioning(tmp_path):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about parameterizing this into a single test?

@pytest.mark.parametrize("save_ver", (True, False))
@pytest.mark.parametrize("load_ver", (True, False))
def test_pickle(tmp_path, save_ver, load_ver):
    testobj = 'iamateststr'
    pickle_fname = str(tmp_path / 'testpickle.pklz')
    utils.filemanip.savepkl(pickle_fname, testobj, versioning=save_ver)
    outobj = utils.filemanip.loadpkl(pickle_fname, versioning=load_ver)
    assert outobj == testobj

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea.

testobj = 'iamateststr'
pickle_fname = str(tmp_path / 'testpickle.pklz')
utils.filemanip.savepkl(pickle_fname, testobj, versioning=True)
outobj = utils.filemanip.loadpkl(pickle_fname)
assert outobj == testobj
2 changes: 0 additions & 2 deletions nipype/utils/filemanip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,6 @@ def loadpkl(infile, versioning=False):
pkl_metadata_line = pkl_file.readline()
pkl_metadata = json.loads(pkl_metadata_line)
except (UnicodeDecodeError, json.JSONDecodeError):
pass
finally:
# Could not get version info
pkl_file.seek(0)

Expand Down