Merge pull request #2639 from ptocca/ptocca-patch-1

Fix missing exception on Windows when importing data on the Variable Explorer
spyder-ide · Aug 24, 2015 · 23fcb65 · 23fcb65
2 parents f441945 + 527cda8
commit 23fcb65
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spyderlib/utils/iofuncs.py b/spyderlib/utils/iofuncs.py
@@ -331,7 +331,7 @@ def load_dictionary(filename):
             # Old format (Spyder 2.0-2.1 for Python 2)
             with open(pickle_filename, 'U') as fdesc:
                 data = pickle.loads(fdesc.read())
-        except (pickle.PickleError, TypeError):
+        except (pickle.PickleError, TypeError, UnicodeDecodeError):
             # New format (Spyder >=2.2 for Python 2 and Python 3)
             with open(pickle_filename, 'rb') as fdesc:
                 data = pickle.loads(fdesc.read())