From 0fc9b8863a735aa5b80794c83fa40df053158c7b Mon Sep 17 00:00:00 2001 From: Steven Tilley Date: Fri, 6 Sep 2019 09:29:57 -0400 Subject: [PATCH] Remove versioning from loadpkl --- nipype/utils/filemanip.py | 7 ++----- nipype/utils/tests/test_filemanip.py | 9 ++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/nipype/utils/filemanip.py b/nipype/utils/filemanip.py index 26859196fc..4f04b73a1e 100644 --- a/nipype/utils/filemanip.py +++ b/nipype/utils/filemanip.py @@ -670,12 +670,12 @@ def load_json(filename): def loadcrash(infile, *args): if infile.endswith('pkl') or infile.endswith('pklz'): - return loadpkl(infile, versioning=True) + return loadpkl(infile) else: raise ValueError('Only pickled crashfiles are supported') -def loadpkl(infile, versioning=False): +def loadpkl(infile): """Load a zipped or plain cPickled file.""" infile = Path(infile) fmlogger.debug('Loading pkl: %s', infile) @@ -700,9 +700,6 @@ def loadpkl(infile, versioning=False): fmlogger.info('Successfully loaded pkl in compatibility mode.') # Unpickling problems except Exception as e: - if not versioning: - raise e - if pkl_metadata and 'version' in pkl_metadata: from nipype import __version__ as version if pkl_metadata['version'] != version: diff --git a/nipype/utils/tests/test_filemanip.py b/nipype/utils/tests/test_filemanip.py index ecfd477504..4ec78e1984 100644 --- a/nipype/utils/tests/test_filemanip.py +++ b/nipype/utils/tests/test_filemanip.py @@ -558,7 +558,7 @@ def test_versioned_pklization(tmpdir): with mock.patch('nipype.utils.tests.test_filemanip.Pickled', PickledBreaker), \ mock.patch('nipype.__version__', '0.0.0'): - loadpkl('./pickled.pkz', versioning=True) + loadpkl('./pickled.pkz') def test_unversioned_pklization(tmpdir): @@ -569,7 +569,7 @@ def test_unversioned_pklization(tmpdir): with pytest.raises(Exception): with mock.patch('nipype.utils.tests.test_filemanip.Pickled', PickledBreaker): - loadpkl('./pickled.pkz', versioning=True) + loadpkl('./pickled.pkz') def test_Path_strict_resolve(tmpdir): @@ -589,11 +589,10 @@ def test_Path_strict_resolve(tmpdir): assert '%s/somefile.txt' % tmpdir == '%s' % testfile.resolve(strict=True) -@pytest.mark.parametrize("load_versioning", [True, False]) @pytest.mark.parametrize("save_versioning", [True, False]) -def test_pickle(tmp_path, save_versioning, load_versioning): +def test_pickle(tmp_path, save_versioning): testobj = 'iamateststr' pickle_fname = str(tmp_path / 'testpickle.pklz') savepkl(pickle_fname, testobj, versioning=save_versioning) - outobj = loadpkl(pickle_fname, versioning=load_versioning) + outobj = loadpkl(pickle_fname) assert outobj == testobj