Commit 64c7b24

authored

Merge pull request #3017 from stilley2/fix/loadpkl

FIX: loadpkl failed when pklz file contained versioning info

2 parents 508df5e + bbc696f commit 64c7b24Copy full SHA for 64c7b24

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -689,8 +689,6 @@ def loadpkl(infile, versioning=False):`
`689`	`689`	`pkl_metadata_line = pkl_file.readline()`
`690`	`690`	`pkl_metadata = json.loads(pkl_metadata_line)`
`691`	`691`	`except (UnicodeDecodeError, json.JSONDecodeError):`
`692`		`- pass`
`693`		`- finally:`
`694`	`692`	`# Could not get version info`
`695`	`693`	`pkl_file.seek(0)`
`696`	`694`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -587,3 +587,13 @@ def test_Path_strict_resolve(tmpdir):`
`587`	`587`	`# If the file is created, it should not raise`
`588`	`588`	`open('somefile.txt', 'w').close()`
`589`	`589`	`assert '%s/somefile.txt' % tmpdir == '%s' % testfile.resolve(strict=True)`
	`590`	`+`
	`591`	`+`
	`592`	`+@pytest.mark.parametrize("load_versioning", [True, False])`
	`593`	`+@pytest.mark.parametrize("save_versioning", [True, False])`
	`594`	`+def test_pickle(tmp_path, save_versioning, load_versioning):`
	`595`	`+ testobj = 'iamateststr'`
	`596`	`+ pickle_fname = str(tmp_path / 'testpickle.pklz')`
	`597`	`+ savepkl(pickle_fname, testobj, versioning=save_versioning)`
	`598`	`+ outobj = loadpkl(pickle_fname, versioning=load_versioning)`
	`599`	`+ assert outobj == testobj`

Comments

(0)