balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-09-27 16:31:42 +00:00
Code Issues Releases Wiki Activity

Fixed pickling error in py2.7

Browse Source
This commit is contained in:
J. Fernando Sánchez 2017-05-17 16:51:01 +02:00
parent ea91e3e4a4
commit 0f89b92457
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
senpy/plugins/__init__.py
View File

@ -98,7 +98,7 @@ class ShelfMixin(object):
if os.path.isfile(self.shelf_file):
try:
self.__dict__['_sh'] = pickle.load(open(self.shelf_file, 'rb'))
except (EOFError, pickle.UnpicklingError):
except (IndexError, EOFError, pickle.UnpicklingError):
logger.warning('{} has a corrupted shelf file!'.format(self.id))
if not self.get('force_shelf', False):
raise

5
tests/test_plugins.py
View File

@ -91,8 +91,8 @@ class PluginsTest(TestCase):
with open(emptyfile, 'w+b'), open(invalidfile, 'w+b') as inf:
inf.write(b'ohno')
files = {emptyfile: ['empty file', EOFError],
invalidfile: ['invalid file', pickle.UnpicklingError]}
files = {emptyfile: ['empty file', (EOFError, IndexError)],
invalidfile: ['invalid file', (pickle.UnpicklingError, IndexError)]}
for fn in files:
with open(fn, 'rb') as f:
@ -105,7 +105,6 @@ class PluginsTest(TestCase):
assert os.path.isfile(a.shelf_file)
print('Shelf file: %s' % a.shelf_file)
with self.assertRaises(error):
# By default, raise an error
a.sh['a'] = 'fromA'
a.save()
del a._sh