Upgrade flake8 to 3.7.9 (#476)

datadog/api/http_client.py

@@ -97,7 +97,7 @@ def request(cls, method, url, headers, params, data, timeout, proxies, verify, m
                 pass
             else:
                 raise _remove_context(HTTPError(e.response.status_code, result.reason))
-        except TypeError as e:
+        except TypeError:
             raise TypeError(
                 u"Your installed version of `requests` library seems not compatible with"
                 u"Datadog's usage. We recommand upgrading it ('pip install -U requests')."

datadog/dogshell/dashboard.py

@@ -81,7 +81,7 @@ def _post(cls, args):
             widgets = sys.stdin.read()
         try:
             widgets = json.loads(widgets)
-        except:
+        except Exception:
             raise Exception('bad json parameter')
 
         # Required arguments
@@ -117,7 +117,7 @@ def _update(cls, args):
             widgets = sys.stdin.read()
         try:
             widgets = json.loads(widgets)
-        except:
+        except Exception:
             raise Exception('bad json parameter')
 
         # Required arguments

datadog/dogshell/monitor.py

@@ -126,7 +126,7 @@ def _post(cls, args):
         if args.options is not None:
             try:
                 options = json.loads(args.options)
-            except:
+            except Exception:
                 raise Exception('bad json parameter')
 
         if args.tags:
@@ -192,7 +192,7 @@ def _update(cls, args):
         if args.options is not None:
             try:
                 to_update['options'] = json.loads(args.options)
-            except:
+            except Exception:
                 raise Exception('bad json parameter')
 
         res = api.Monitor.update(args.monitor_id, **to_update)

datadog/dogshell/screenboard.py

@@ -174,7 +174,7 @@ def _post(cls, args):
             graphs = sys.stdin.read()
         try:
             graphs = json.loads(graphs)
-        except:
+        except Exception:
             raise Exception('bad json parameter')
         res = api.Screenboard.create(
             title=args.title, description=args.description, graphs=[graphs],
@@ -195,7 +195,7 @@ def _update(cls, args):
             graphs = sys.stdin.read()
         try:
             graphs = json.loads(graphs)
-        except:
+        except Exception:
             raise Exception('bad json parameter')
 
         res = api.Screenboard.update(
@@ -271,7 +271,7 @@ def _new_file(cls, args):
             graphs = sys.stdin.read()
         try:
             graphs = json.loads(graphs)
-        except:
+        except Exception:
             raise Exception('bad json parameter')
         res = api.Screenboard.create(board_title=args.filename,
                                      description="Description for {0}".format(args.filename),

datadog/dogshell/timeboard.py

@@ -141,7 +141,7 @@ def _new_file(cls, args):
             graphs = sys.stdin.read()
         try:
             graphs = json.loads(graphs)
-        except:
+        except Exception:
             raise Exception('bad json parameter')
         res = api.Timeboard.create(
             title=args.filename,
@@ -236,7 +236,7 @@ def _post(cls, args):
             graphs = sys.stdin.read()
         try:
             graphs = json.loads(graphs)
-        except:
+        except Exception:
             raise Exception('bad json parameter')
         res = api.Timeboard.create(title=args.title, description=args.description, graphs=[graphs],
                                    template_variables=args.template_variables)
@@ -256,7 +256,7 @@ def _update(cls, args):
             graphs = sys.stdin.read()
         try:
             graphs = json.loads(graphs)
-        except:
+        except Exception:
             raise Exception('bad json parameter')
 
         res = api.Timeboard.update(args.timeboard_id, title=args.title,

datadog/threadstats/base.py

@@ -402,10 +402,10 @@ def flush():
             try:
                 log.debug("Flushing metrics in thread")
                 self.flush()
-            except:
+            except Exception:
                 try:
                     log.exception("Error flushing in thread")
-                except:
+                except Exception:
                     pass
 
         log.info("Starting flush thread with interval %s." % self.flush_interval)
@@ -427,10 +427,10 @@ def flush():
                     log.debug("Flushing metrics in greenlet")
                     self.flush()
                     gevent.sleep(self.flush_interval)
-                except:
+                except Exception:
                     try:
                         log.exception("Error flushing in greenlet")
-                    except:
+                    except Exception:
                         pass
 
         log.info("Starting flush greenlet with interval %s." % self.flush_interval)

datadog/util/hostname.py

@@ -128,7 +128,7 @@ def get_ec2_instance_id():
         finally:
             # Reset the previous default timeout
             socket.setdefaulttimeout(old_timeout)
-    except:
+    except Exception:
         return socket.gethostname()
 
 

tox.ini

@@ -28,7 +28,7 @@ commands =
 [testenv:flake8]
 skip_install = true
 deps =
-    flake8==3.4.1
+    flake8==3.7.9
 commands = flake8 datadog
 
 [flake8]