Merge pull request #238 from timvaillancourt/flake8_E722_fix

Fix new flake8 'E722 do not use bare except' errors

Author: dbmurphy

mongodb_consistent_backup/Backup/Mongodump/Mongodump.py

@@ -187,7 +187,7 @@ def close(self):
                     thread.terminate()
             try:
                 self.timer.stop(self.timer_name)
-            except:
+            except Exception:
                 pass
             logging.info("Stopped all mongodump threads")
             self.stopped = True

mongodb_consistent_backup/Backup/Mongodump/MongodumpThread.py

@@ -85,7 +85,7 @@ def parse_mongodump_line(self, line):
             elif is_datetime(line):
                 return None
             return "%s:\t%s" % (self.uri, line)
-        except:
+        except Exception:
             return None
 
     def is_password_prompt(self, line):

mongodb_consistent_backup/Common/Config.py

@@ -16,7 +16,7 @@ def parse_config_bool(item):
             if item.rstrip().lower() is "true":
                 return True
         return False
-    except:
+    except Exception:
         return False
 
 
@@ -121,7 +121,7 @@ def check_required(self):
         for key in required:
             try:
                 self._get(key)
-            except:
+            except Exception:
                 raise mongodb_consistent_backup.Errors.OperationError(
                     'Field "%s" (config file field: "%s.%s") must be set via command-line or config file!' % (
                         key,
@@ -160,5 +160,5 @@ def __getattr__(self, key):
         try:
             return self._config.get(key)
         # TODO-timv What can we do to make this better?
-        except:
+        except Exception:
             return None

mongodb_consistent_backup/Common/MongoUri.py

@@ -71,7 +71,7 @@ def get(self, incr_idx=False):
                 if incr_idx:
                     self.addr_idx += 1
                 return addr
-        except:
+        except Exception:
             pass
         return None
 

mongodb_consistent_backup/Common/Util.py

@@ -17,7 +17,7 @@ def is_datetime(string):
     try:
         parser.parse(string)
         return True
-    except:
+    except Exception:
         return False
 
 

mongodb_consistent_backup/Main.py

@@ -169,7 +169,7 @@ def cleanup_and_exit(self, code, frame):
                 submodule = getattr(self, submodule_name)
                 if submodule:
                     submodule.close()
-            except:
+            except Exception:
                 continue
 
         if self.manager:

mongodb_consistent_backup/Oplog/Tailer/Tailer.py

@@ -98,7 +98,7 @@ def stop(self, kill=False, sleep_secs=3):
                 # get current optime of replset primary to use a stop position
                 try:
                     timestamp = replset.primary_optime(True, True)
-                except:
+                except Exception:
                     logging.warning("Could not get current optime from PRIMARY! Using now as a stop time")
                     timestamp = Timestamp(int(time()), 0)
 

mongodb_consistent_backup/State.py

@@ -26,7 +26,7 @@ def __init__(self, base_dir, config, filename="meta.bson", state_version=1, meta
             # try normal mkdir first, fallback to recursive mkdir if there is an exception
             try:
                 os.mkdir(self.state_dir)
-            except:
+            except Exception:
                 try:
                     os.makedirs(self.state_dir)
                 except Exception, e:
@@ -157,7 +157,7 @@ def load_backups(self):
                     self.backups[subdir] = self.load(True, state_file)
                     if self.backups[subdir]["completed"]:
                         self.completed_backups += 1
-                except:
+                except Exception:
                     continue
             logging.info("Found %i existing completed backups for set" % self.completed_backups)
         return self.backups