Run flake8 with Python 3

This allows to remove a few noqa flag from files using `yield from` and fixing
various errors.

The compat tests have been merged to a single scenario that works for both
Python version in order to make flake8 happier.

Some wild noqa tag have been replaced by specific flake8 error code ignore tag
so avoid skipping non-wanted mistakes.

Author: jd

ddtrace/bootstrap/sitecustomize.py

@@ -18,7 +18,8 @@
 
 if logs_injection:
     # immediately patch logging if trace id injected
-    from ddtrace import patch; patch(logging=True)  # noqa
+    from ddtrace import patch
+    patch(logging=True)
 
 debug = os.environ.get('DATADOG_TRACE_DEBUG')
 
@@ -108,7 +109,8 @@ def add_global_tags(tracer):
 
     if patch:
         update_patched_modules()
-        from ddtrace import patch_all; patch_all(**EXTRA_PATCHED_MODULES) # noqa
+        from ddtrace import patch_all
+        patch_all(**EXTRA_PATCHED_MODULES)
 
     debug = os.environ.get('DATADOG_TRACE_DEBUG')
     if debug and debug.lower() == 'true':
@@ -143,6 +145,6 @@ def add_global_tags(tracer):
     # properly loaded without exceptions. This must be the last action in the module
     # when the execution ends with a success.
     loaded = True
-except Exception as e:
+except Exception:
     loaded = False
     log.warn('error configuring Datadog tracing', exc_info=True)

ddtrace/commands/ddtrace_run.py

@@ -34,7 +34,7 @@
                            (e.g. pylons, flask, django)
                            For tracing without a web integration, prefer setting the service name in code.
     DATADOG_PRIORITY_SAMPLING=true|false : (default: false): enables Priority Sampling.
-""" # noqa
+"""  # noqa: E501
 
 
 def _ddtrace_root():

ddtrace/contrib/aiobotocore/patch.py

@@ -49,7 +49,7 @@ def read(self, *args, **kwargs):
             span.span_type = self._self_parent_span.span_type
             span.meta = dict(self._self_parent_span.meta)
 
-            result = yield from self.__wrapped__.read(*args, **kwargs)  # noqa: E999
+            result = yield from self.__wrapped__.read(*args, **kwargs)
             span.set_tag('Length', len(result))
 
         return result
@@ -72,7 +72,7 @@ def __aexit__(self, *args, **kwargs):
 def _wrapped_api_call(original_func, instance, args, kwargs):
     pin = Pin.get_from(instance)
     if not pin or not pin.enabled():
-        result = yield from original_func(*args, **kwargs)  # noqa: E999
+        result = yield from original_func(*args, **kwargs)
         return result
 
     endpoint_name = deep_getattr(instance, '_endpoint._endpoint_prefix')
@@ -99,7 +99,7 @@ def _wrapped_api_call(original_func, instance, args, kwargs):
         }
         span.set_tags(meta)
 
-        result = yield from original_func(*args, **kwargs)  # noqa: E999
+        result = yield from original_func(*args, **kwargs)
 
         body = result.get('Body')
         if isinstance(body, ClientResponseContentProxy):

ddtrace/contrib/aiohttp/middlewares.py

@@ -60,7 +60,7 @@ def attach_context(request):
         request[REQUEST_CONTEXT_KEY] = request_span.context
         request[REQUEST_SPAN_KEY] = request_span
         try:
-            response = yield from handler(request)  # noqa: E999
+            response = yield from handler(request)
             return response
         except Exception:
             request_span.set_traceback()

ddtrace/contrib/aiopg/connection.py

@@ -23,7 +23,7 @@ def __init__(self, cursor, pin):
     def _trace_method(self, method, resource, extra_tags, *args, **kwargs):
         pin = Pin.get_from(self)
         if not pin or not pin.enabled():
-            result = yield from method(*args, **kwargs)  # noqa: E999
+            result = yield from method(*args, **kwargs)
             return result
         service = pin.service
 
@@ -44,15 +44,15 @@ def _trace_method(self, method, resource, extra_tags, *args, **kwargs):
                 result = yield from method(*args, **kwargs)
                 return result
             finally:
-                s.set_metric("db.rowcount", self.rowcount)
+                s.set_metric('db.rowcount', self.rowcount)
 
     @asyncio.coroutine
     def executemany(self, query, *args, **kwargs):
         # FIXME[matt] properly handle kwargs here. arg names can be different
         # with different libs.
         result = yield from self._trace_method(
             self.__wrapped__.executemany, query, {'sql.executemany': 'true'},
-            query, *args, **kwargs)  # noqa: E999
+            query, *args, **kwargs)
         return result
 
     @asyncio.coroutine
@@ -64,7 +64,7 @@ def execute(self, query, *args, **kwargs):
     @asyncio.coroutine
     def callproc(self, proc, args):
         result = yield from self._trace_method(
-            self.__wrapped__.callproc, proc, {}, proc, args)  # noqa: E999
+            self.__wrapped__.callproc, proc, {}, proc, args)
         return result
 
 
@@ -88,7 +88,7 @@ def cursor(self, *args, **kwargs):
 
     @asyncio.coroutine
     def _cursor(self, *args, **kwargs):
-        cursor = yield from self.__wrapped__._cursor(*args, **kwargs)  # noqa: E999
+        cursor = yield from self.__wrapped__._cursor(*args, **kwargs)
         pin = Pin.get_from(self)
         if not pin:
             return cursor

ddtrace/contrib/aiopg/patch.py

@@ -32,7 +32,7 @@ def unpatch():
 
 @asyncio.coroutine
 def patched_connect(connect_func, _, args, kwargs):
-    conn = yield from connect_func(*args, **kwargs)  # noqa: E999
+    conn = yield from connect_func(*args, **kwargs)
     return psycppg_patch_conn(conn, traced_conn_cls=AIOTracedConnection)
 
 

ddtrace/contrib/asyncio/helpers.py

@@ -25,7 +25,7 @@ def set_call_context(task, ctx):
     setattr(task, CONTEXT_ATTR, ctx)
 
 
-def ensure_future(coro_or_future, *, loop=None, tracer=None):  # noqa: E999
+def ensure_future(coro_or_future, *, loop=None, tracer=None):
     """
     Wrapper for the asyncio.ensure_future() function that
     sets a context to the newly created Task. If the current

tests/contrib/aiobotocore/py35/test.py

@@ -1,5 +1,3 @@
-# flake8: noqa
-# DEV: Skip linting, we lint with Python 2, we'll get SyntaxErrors from `async`
 import aiobotocore
 
 from ddtrace.contrib.aiobotocore.patch import patch, unpatch
@@ -37,7 +35,7 @@ async def test_response_context_manager(self):
 
         traces = self.tracer.writer.pop_traces()
 
-        version = aiobotocore.__version__.split(".")
+        version = aiobotocore.__version__.split('.')
         pre_08 = int(version[0]) == 0 and int(version[1]) < 8
         # Version 0.8+ generates only one span for reading an object.
         if pre_08:

tests/contrib/aiobotocore/test.py

@@ -1,5 +1,3 @@
-# flake8: noqa
-# DEV: Skip linting, we lint with Python 2, we'll get SyntaxErrors from `yield from`
 import aiobotocore
 from botocore.errorfactory import ClientError
 
@@ -126,7 +124,7 @@ def test_s3_client_read(self):
             yield from response['Body'].read()
 
         traces = self.tracer.writer.pop_traces()
-        version = aiobotocore.__version__.split(".")
+        version = aiobotocore.__version__.split('.')
         pre_08 = int(version[0]) == 0 and int(version[1]) < 8
         if pre_08:
             self.assertEqual(len(traces), 2)
@@ -247,7 +245,7 @@ def test_opentraced_client(self):
 
         with ot_tracer.start_active_span('ot_outer_span'):
             with aiobotocore_client('ec2', self.tracer) as ec2:
-                    yield from ec2.describe_instances()
+                yield from ec2.describe_instances()
 
         traces = self.tracer.writer.pop_traces()
         print(traces)

tests/contrib/aiohttp/app/web.py

@@ -1,4 +1,3 @@
-# flake8: noqa
 import os
 import jinja2
 import asyncio
@@ -61,6 +60,7 @@ def route_sub_span(request):
         span.set_tag('sub_span', 'true')
         return web.Response(text='OK')
 
+
 @asyncio.coroutine
 def coro_2(request):
     tracer = get_tracer(request)