summary refs log tree commit diff stats
path: root/ranger/core
diff options
context:
space:
mode:
authorstepshal <nessento@openmailbox.org>2016-06-22 00:01:38 +0700
committerstepshal <nessento@openmailbox.org>2016-06-22 00:01:38 +0700
commitbedfed3db77ecaafdb86e9e4847c7bb6ddc2563d (patch)
tree274a6e10436c085ac8421b53d7930761b6a08f60 /ranger/core
parent5348e120aa6d39604b2426577f84669b9ce0aa24 (diff)
downloadranger-bedfed3db77ecaafdb86e9e4847c7bb6ddc2563d.tar.gz
Use 'except Exception:' instead of 'except:'
Diffstat (limited to 'ranger/core')
-rw-r--r--ranger/core/actions.py26
-rw-r--r--ranger/core/fm.py6
-rw-r--r--ranger/core/loader.py10
-rw-r--r--ranger/core/main.py10
-rw-r--r--ranger/core/runner.py6
-rw-r--r--ranger/core/tab.py2
6 files changed, 30 insertions, 30 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index d7385355..9b806d56 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -134,7 +134,7 @@ class Actions(FileManagerAware, SettingsAware):
         """
         try:
             cwd = self.thisdir
-        except:
+        except Exception:
             pass
         else:
             cwd.unload()
@@ -166,7 +166,7 @@ class Actions(FileManagerAware, SettingsAware):
         """
         try:
             item = self.loader.queue[0]
-        except:
+        except Exception:
             self.notify("Type Q or :quit<Enter> to exit ranger")
         else:
             self.notify("Aborting: " + item.get_description())
@@ -283,7 +283,7 @@ class Actions(FileManagerAware, SettingsAware):
         for i in range(1, 10):
             try:
                 tab = self.fm.tabs[i]
-            except:
+            except Exception:
                 continue
             tabdir = tab.thisdir
             if not tabdir:
@@ -429,7 +429,7 @@ class Actions(FileManagerAware, SettingsAware):
                 steps *= narg
             try:
                 directory = os.path.join(*(['..'] * steps))
-            except:
+            except Exception:
                 return
             self.thistab.enter_dir(directory)
             self.change_mode('normal')
@@ -455,7 +455,7 @@ class Actions(FileManagerAware, SettingsAware):
                 if self.mode == 'visual':
                     try:
                         startpos = cwd.index(self._visual_start)
-                    except:
+                    except Exception:
                         self._visual_start = None
                         startpos = min(self._visual_start_pos, len(cwd))
                     # The files between here and _visual_start_pos
@@ -690,7 +690,7 @@ class Actions(FileManagerAware, SettingsAware):
         if isinstance(text, str) and regexp:
             try:
                 text = re.compile(text, re.L | re.U | re.I)
-            except:
+            except Exception:
                 return False
         self.thistab.last_search = text
         self.search_next(order='search', offset=offset)
@@ -819,7 +819,7 @@ class Actions(FileManagerAware, SettingsAware):
     def draw_possible_programs(self):
         try:
             target = self.thistab.get_selection()[0]
-        except:
+        except Exception:
             self.ui.browser.draw_info = []
             return
         programs = [program for program in self.rifle.list_commands([target.path],
@@ -841,7 +841,7 @@ class Actions(FileManagerAware, SettingsAware):
     def display_command_help(self, console_widget):
         try:
             command = console_widget._get_cmd_class()
-        except:
+        except Exception:
             self.notify("Feature not available!", bad=True)
             return
 
@@ -893,7 +893,7 @@ class Actions(FileManagerAware, SettingsAware):
         try:
             del self.previews[path]
             self.ui.need_redraw = True
-        except:
+        except Exception:
             return False
 
     if version_info[0] == 3:
@@ -924,7 +924,7 @@ class Actions(FileManagerAware, SettingsAware):
             # PDF file.
             try:
                 data = self.previews[path]
-            except:
+            except Exception:
                 data = self.previews[path] = {'loading': False}
             else:
                 if data['loading']:
@@ -935,7 +935,7 @@ class Actions(FileManagerAware, SettingsAware):
             if found is False:
                 try:
                     stat_ = os.stat(self.settings.preview_script)
-                except:
+                except Exception:
                     self.fm.notify("Preview Script `%s' doesn't exist!" %
                             self.settings.preview_script, bad=True)
                     return None
@@ -1016,7 +1016,7 @@ class Actions(FileManagerAware, SettingsAware):
                 def on_destroy(signal):
                     try:
                         del self.previews[path]
-                    except:
+                    except Exception:
                         pass
                 loadable.signal_bind('after', on_after)
                 loadable.signal_bind('destroy', on_destroy)
@@ -1027,7 +1027,7 @@ class Actions(FileManagerAware, SettingsAware):
         else:
             try:
                 return codecs.open(path, 'r', errors='ignore')
-            except:
+            except Exception:
                 return None
 
     # --------------------------
diff --git a/ranger/core/fm.py b/ranger/core/fm.py
index a827bb6c..cabb6c2b 100644
--- a/ranger/core/fm.py
+++ b/ranger/core/fm.py
@@ -65,7 +65,7 @@ class FM(Actions, SignalDispatcher):
 
         try:
             self.username = pwd.getpwuid(os.geteuid()).pw_name
-        except:
+        except Exception:
             self.username = 'uid:' + str(os.geteuid())
         self.hostname = socket.gethostname()
         self.home_path = os.path.expanduser('~')
@@ -188,13 +188,13 @@ class FM(Actions, SignalDispatcher):
         if self.ui:
             try:
                 self.ui.destroy()
-            except:
+            except Exception:
                 if debug:
                     raise
         if self.loader:
             try:
                 self.loader.destroy()
-            except:
+            except Exception:
                 if debug:
                     raise
 
diff --git a/ranger/core/loader.py b/ranger/core/loader.py
index bae0e54d..0cdc5368 100644
--- a/ranger/core/loader.py
+++ b/ranger/core/loader.py
@@ -14,7 +14,7 @@ import select
 try:
     import chardet
     HAVE_CHARDET = True
-except:
+except Exception:
     HAVE_CHARDET = False
 
 
@@ -36,7 +36,7 @@ class Loadable(object):
     def unpause(self):
         try:
             del self.paused
-        except:
+        except Exception:
             pass
 
     def destroy(self):
@@ -70,7 +70,7 @@ class CopyLoader(Loadable, FileManagerAware):
             else:
                 try:
                     fstat = os.stat(fname)
-                except:
+                except Exception:
                     continue
                 size += max(step, math.ceil(fstat.st_size / step) * step)
         return size
@@ -236,7 +236,7 @@ class CommandLoader(Loadable, SignalDispatcher, FileManagerAware):
                 return
             try:
                 self.process.send_signal(20)
-            except:
+            except Exception:
                 pass
             Loadable.pause(self)
             self.signal_emit('pause', process=self.process, loader=self)
@@ -245,7 +245,7 @@ class CommandLoader(Loadable, SignalDispatcher, FileManagerAware):
         if not self.finished and self.paused:
             try:
                 self.process.send_signal(18)
-            except:
+            except Exception:
                 pass
             Loadable.unpause(self)
             self.signal_emit('unpause', process=self.process, loader=self)
diff --git a/ranger/core/main.py b/ranger/core/main.py
index 77e06861..fefffad5 100644
--- a/ranger/core/main.py
+++ b/ranger/core/main.py
@@ -19,7 +19,7 @@ def main():
 
     try:
         locale.setlocale(locale.LC_ALL, '')
-    except:
+    except Exception:
         print("Warning: Unable to set locale.  Expect encoding problems.")
 
     # so that programs can know that ranger spawned them:
@@ -44,7 +44,7 @@ def main():
                 f = open(fm.confpath('tagged'), 'r', errors='replace')
             else:
                 f = open(fm.confpath('tagged'), 'r')
-        except:
+        except Exception:
             pass
         else:
             for line in f.readlines():
@@ -153,7 +153,7 @@ def main():
         if crash_traceback:
             try:
                 filepath = fm.thisfile.path if fm.thisfile else "None"
-            except:
+            except Exception:
                 filepath = "None"
         try:
             fm.ui.destroy()
@@ -167,7 +167,7 @@ def main():
             print("Locale: %s" % '.'.join(str(s) for s in locale.getlocale()))
             try:
                 print("Current file: %s" % filepath)
-            except:
+            except Exception:
                 pass
             print(crash_traceback)
             print("ranger crashed.  "
@@ -294,7 +294,7 @@ def load_settings(fm, clean):
             plugindir = fm.confpath('plugins')
             plugins = [p[:-3] for p in os.listdir(plugindir)
                     if p.endswith('.py') and not p.startswith('_')]
-        except:
+        except Exception:
             pass
         else:
             if not os.path.exists(fm.confpath('plugins', '__init__.py')):
diff --git a/ranger/core/runner.py b/ranger/core/runner.py
index 60e14202..6d03f8fb 100644
--- a/ranger/core/runner.py
+++ b/ranger/core/runner.py
@@ -69,7 +69,7 @@ class Context(object):
     def filepaths(self):
         try:
             return [f.path for f in self.files]
-        except:
+        except Exception:
             return []
 
     def __iter__(self):
@@ -104,12 +104,12 @@ class Runner(object):
             if boolean:
                 try:
                     self.ui.initialize()
-                except:
+                except Exception:
                     self._log("Failed to initialize UI")
             else:
                 try:
                     self.ui.suspend()
-                except:
+                except Exception:
                     self._log("Failed to suspend UI")
 
     def __call__(self, action=None, try_app_first=False,
diff --git a/ranger/core/tab.py b/ranger/core/tab.py
index faaaddfd..7b60a5b1 100644
--- a/ranger/core/tab.py
+++ b/ranger/core/tab.py
@@ -126,7 +126,7 @@ class Tab(FileManagerAware, SettingsAware):
 
         try:
             os.chdir(path)
-        except:
+        except Exception:
             return True
         self.path = path
         self.thisdir = new_thisdir