From e042d6bb28a29ad46a1b27feadcf5d58b065b875 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 1 Dec 2017 14:28:43 +1100
Subject: [PATCH] Pickle functions sometimes raise EOFError
---
fsl/utils/settings.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fsl/utils/settings.py b/fsl/utils/settings.py
index 675ad29c4..7f011a1e8 100644
--- a/fsl/utils/settings.py
+++ b/fsl/utils/settings.py
@@ -372,7 +372,7 @@ class Settings(object):
try:
with open(configFile, 'rb') as f:
return pickle.load(f)
- except (IOError, pickle.UnpicklingError):
+ except (IOError, pickle.UnpicklingError, EOFError):
log.debug('Unable to load stored {} configuration file '
'{}'.format(self.__configID, configFile),
exc_info=True)
@@ -391,7 +391,7 @@ class Settings(object):
try:
with open(configFile, 'wb') as f:
pickle.dump(config, f)
- except (IOError, pickle.PicklingError):
+ except (IOError, pickle.PicklingError, EOFError):
log.warning('Unable to save {} configuration file '
'{}'.format(self.__configID, configFile),
exc_info=True)
--
GitLab