Merge branch '0.17.1-dev' into kyle-verhoog/services-workaround

Author: Kyle-Verhoog

ddtrace/contrib/cassandra/session.py

@@ -106,7 +106,7 @@ def traced_start_fetching_next_page(func, instance, args, kwargs):
     setattr(instance, CURRENT_SPAN, span)
     try:
         return func(*args, **kwargs)
-    except:
+    except Exception:
         with span:
             span.set_exc_info(*sys.exc_info())
         raise
@@ -161,7 +161,7 @@ def traced_execute_async(func, instance, args, kwargs):
         )
         result.clear_callbacks()
         return result
-    except:
+    except Exception:
         with span:
             span.set_exc_info(*sys.exc_info())
         raise

ddtrace/contrib/grpc/client_interceptor.py

@@ -34,7 +34,7 @@ def intercept_unary_stream(self, continuation, client_call_details, request):
             new_details = inject_span(span, client_call_details)
             try:
                 return continuation(new_details, request)
-            except:
+            except Exception:
                 span.set_traceback()
                 raise
 
@@ -48,6 +48,6 @@ def intercept_stream_stream(self, continuation, client_call_details, request_ite
             new_details = inject_span(span, client_call_details)
             try:
                 return continuation(new_details, request_iterator)
-            except:
+            except Exception:
                 span.set_traceback()
                 raise

ddtrace/contrib/pylons/middleware.py

@@ -73,7 +73,7 @@ def _start_response(status, *args, **kwargs):
                     code = int(code)
                     if not 100 <= code < 600:
                         code = 500
-                except:
+                except Exception:
                     code = 500
                 span.set_tag(http.STATUS_CODE, code)
                 span.error = 1

tox.ini

@@ -372,7 +372,7 @@ deps=
 ignore_outcome=true
 
 [testenv:flake8]
-deps=flake8==3.2.0
+deps=flake8==3.5.0
 commands=flake8 ddtrace
 basepython=python2