From 43c71f7a938556337bad3ed2ad4b277e730fb969 Mon Sep 17 00:00:00 2001 From: Jon Anderson Date: Sun, 21 Jan 2018 01:19:41 -0800 Subject: Added except catching for Python2. When reading a file for which Ranger doesn't have permissions, Python3 throws an OSError. Python2 on the other hand throws a IOError, which wasn't being caught and caused Ranger to crash. IOError was added to catch statements for this reason. --- ranger/container/file.py | 3 ++- ranger/core/actions.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ranger/container/file.py b/ranger/container/file.py index 17ca577c..83942671 100644 --- a/ranger/container/file.py +++ b/ranger/container/file.py @@ -58,7 +58,8 @@ class File(FileSystemObject): try: with open(self.path, 'rb') as fobj: self._firstbytes = set(fobj.read(N_FIRST_BYTES)) - except OSError: + # IOError for Python2, OSError for Python3 + except (IOError, OSError): return None return self._firstbytes diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 0298af19..aef0d205 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -978,7 +978,8 @@ class Actions( # pylint: disable=too-many-instance-attributes,too-many-public-m if not self.settings.preview_script or not self.settings.use_preview_script: try: return codecs.open(path, 'r', errors='ignore') - except OSError: + # IOError for Python2, OSError for Python3 + except (IOError, OSError): return None # self.previews is a 2 dimensional dict: -- cgit 1.4.1-2-gfad0