From c1dea12da04a8706f8596834a2d001c69298f25a Mon Sep 17 00:00:00 2001 From: dalthviz Date: Tue, 7 Aug 2018 15:31:17 -0500 Subject: [PATCH 1/2] Handle error when doing a browser history update. --- spyder/widgets/explorer.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spyder/widgets/explorer.py b/spyder/widgets/explorer.py index 6ecd7cf62d1..9195b02d557 100644 --- a/spyder/widgets/explorer.py +++ b/spyder/widgets/explorer.py @@ -1122,9 +1122,13 @@ def go_to_next_directory(self): def update_history(self, directory): """Update browse history""" - directory = osp.abspath(to_text_string(directory)) - if directory in self.history: - self.histindex = self.history.index(directory) + try: + directory = osp.abspath(to_text_string(directory)) + if directory in self.history: + self.histindex = self.history.index(directory) + except Exception: + user_directory = osp.expanduser('~') + self.chdir(directory=user_directory, browsing_history=True) def chdir(self, directory=None, browsing_history=False): """Set directory as working directory""" From 4369ecb4309c0c12ed1bfb45f93d02594ad5b02a Mon Sep 17 00:00:00 2001 From: dalthviz Date: Wed, 8 Aug 2018 17:25:30 -0500 Subject: [PATCH 2/2] Use already implemented function to get home directory. --- spyder/widgets/explorer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spyder/widgets/explorer.py b/spyder/widgets/explorer.py index 9195b02d557..c09d61ec2f1 100644 --- a/spyder/widgets/explorer.py +++ b/spyder/widgets/explorer.py @@ -32,7 +32,7 @@ QMessageBox, QToolButton, QTreeView, QVBoxLayout, QWidget) # Local imports -from spyder.config.base import _ +from spyder.config.base import _, get_home_dir from spyder.py3compat import (str_lower, to_binary_string, to_text_string) from spyder.utils import icon_manager as ima @@ -1127,7 +1127,7 @@ def update_history(self, directory): if directory in self.history: self.histindex = self.history.index(directory) except Exception: - user_directory = osp.expanduser('~') + user_directory = get_home_dir() self.chdir(directory=user_directory, browsing_history=True) def chdir(self, directory=None, browsing_history=False):