resolve flake8 and black issues

Author: brettlangdon

ddtrace/__init__.py

@@ -6,11 +6,11 @@
 from .internal.import_hooks import patch as patch_import_hooks
 patch_import_hooks()  # noqa: E402
 
-from .monkey import patch, patch_all
-from .pin import Pin
-from .span import Span
-from .tracer import Tracer
-from .settings import config
+from .monkey import patch, patch_all  # noqa: E402
+from .pin import Pin  # noqa: E402
+from .span import Span  # noqa: E402
+from .tracer import Tracer  # noqa: E402
+from .settings import config  # noqa: E402
 
 
 try:

ddtrace/compat.py

@@ -6,15 +6,15 @@
 from ddtrace.vendor import six
 
 __all__ = [
-    'httplib',
-    'iteritems',
-    'PY2',
-    'Queue',
-    'stringify',
-    'StringIO',
-    'urlencode',
-    'parse',
-    'reraise',
+    "httplib",
+    "iteritems",
+    "PY2",
+    "Queue",
+    "stringify",
+    "StringIO",
+    "urlencode",
+    "parse",
+    "reraise",
 ]
 
 PYTHON_VERSION_INFO = sys.version_info
@@ -42,7 +42,7 @@
 string_type = six.string_types[0]
 msgpack_type = six.binary_type
 # DEV: `six` doesn't have `float` in `integer_types`
-numeric_types = six.integer_types + (float, )
+numeric_types = six.integer_types + (float,)
 
 # Pattern class generated by `re.compile`
 if PYTHON_VERSION_INFO >= (3, 7):
@@ -76,7 +76,9 @@ def time_ns():
     # Execute from a string to get around syntax errors from `yield from`
     # DEV: The idea to do this was stolen from `six`
     #   https://github.com/benjaminp/six/blob/15e31431af97e5e64b80af0a3f598d382bcdd49a/six.py#L719-L737
-    six.exec_(textwrap.dedent("""
+    six.exec_(
+        textwrap.dedent(
+            """
     import functools
     import asyncio
 
@@ -100,7 +102,9 @@ def func_wrapper(*args, **kwargs):
                 return result
 
         return func_wrapper
-    """))
+    """
+        )
+    )
 
 else:
     # asyncio is missing so we can't have coroutines; these
@@ -112,6 +116,7 @@ def iscoroutinefunction(fn):
     def make_async_decorator(tracer, fn, *params, **kw_params):
         return fn
 
+
 # static version of getattr backported from Python 3.7
 try:
     from inspect import getattr_static
@@ -121,7 +126,7 @@ def make_async_decorator(tracer, fn, *params, **kw_params):
     _sentinel = object()
 
     def _static_getmro(klass):
-        return type.__dict__['__mro__'].__get__(klass)
+        return type.__dict__["__mro__"].__get__(klass)
 
     def _check_instance(obj, attr):
         instance_dict = {}
@@ -155,9 +160,11 @@ def _shadowed_dict(klass):
             except KeyError:
                 pass
             else:
-                if not (type(class_dict) is types.GetSetDescriptorType and # noqa: E721,E261,W504
-                        class_dict.__name__ == "__dict__" and # noqa: E261,W504
-                        class_dict.__objclass__ is entry):
+                if not (
+                    type(class_dict) is types.GetSetDescriptorType  # noqa: E721
+                    and class_dict.__name__ == "__dict__"  # noqa: E721,E261,W504
+                    and class_dict.__objclass__ is entry  # noqa: E261,W504
+                ):
                     return class_dict
         return _sentinel
 
@@ -176,17 +183,18 @@ def getattr_static(obj, attr, default=_sentinel):
         if not _is_type(obj):
             klass = type(obj)
             dict_attr = _shadowed_dict(klass)
-            if (dict_attr is _sentinel or # noqa: E261,E721,W504
-                type(dict_attr) is types.MemberDescriptorType):
+            if dict_attr is _sentinel or type(dict_attr) is types.MemberDescriptorType:  # noqa: E261,E721,W504
                 instance_result = _check_instance(obj, attr)
         else:
             klass = obj
 
         klass_result = _check_class(klass, attr)
 
         if instance_result is not _sentinel and klass_result is not _sentinel:
-            if (_check_class(type(klass_result), '__get__') is not _sentinel and # noqa: W504,E261,E721
-                _check_class(type(klass_result), '__set__') is not _sentinel):
+            if (
+                _check_class(type(klass_result), "__get__") is not _sentinel
+                and _check_class(type(klass_result), "__set__") is not _sentinel  # noqa: W504,E261,E721
+            ):
                 return klass_result
 
         if instance_result is not _sentinel:
@@ -219,8 +227,8 @@ def to_unicode(s):
 
     # If the object has a `decode` method, then decode into `utf-8`
     #   e.g. Python 2 `str`, Python 2/3 `bytearray`, etc
-    if hasattr(s, 'decode'):
-        return s.decode('utf-8')
+    if hasattr(s, "decode"):
+        return s.decode("utf-8")
 
     # Always try to coerce the object into the `six.text_type` object we expect
     #   e.g. `to_unicode(1)`, `to_unicode(dict(key='value'))`

ddtrace/opentracer/tracer.py

@@ -68,7 +68,7 @@ def __init__(self, service_name=None, config=None, scope_manager=None, dd_tracer
             invalid_keys = config_invalid_keys(self._config)
             if invalid_keys:
                 str_invalid_keys = ','.join(invalid_keys)
-                raise ConfigException('invalid key(s) given (%s)'.format(str_invalid_keys))
+                raise ConfigException('invalid key(s) given ({})'.format(str_invalid_keys))
 
         if not self._service_name:
             raise ConfigException(""" Cannot detect the \'service_name\'.

ddtrace/span.py

@@ -373,7 +373,7 @@ def pprint(self):
         ]
 
         lines.extend((' ', '%s:%s' % kv) for kv in sorted(self.meta.items()))
-        return '\n'.join('%10s %s' % l for l in lines)
+        return '\n'.join('%10s %s' % line for line in lines)
 
     @property
     def context(self):

tests/contrib/asyncio/test_tracer.py

@@ -370,6 +370,7 @@ def test_trace_multiple_coroutines_ot_inner(self):
         # if multiple coroutines have nested tracing, they must belong
         # to the same trace
         ot_tracer = init_tracer('asyncio_svc', self.tracer)
+
         @asyncio.coroutine
         def coro():
             # another traced coroutine

tests/internal/runtime/utils.py

@@ -50,17 +50,17 @@ def cgroup_line_valid_test_cases():
 
     valid_test_cases = dict(
         (
-            ':'.join([id, ','.join(groups), path.format(container_id, pod_id)]),
+            ':'.join([id_, ','.join(groups), path.format(container_id, pod_id)]),
             CGroupInfo(
-                id=id,
+                id=id_,
                 groups=','.join(groups),
                 path=path.format(container_id, pod_id),
                 controllers=groups,
                 container_id=container_id if '{0}' in path else None,
                 pod_id=pod_id if '{1}' in path else None,
             )
         )
-        for path, id, groups, container_id, pod_id
+        for path, id_, groups, container_id, pod_id
         in itertools.product(paths, ids, controllers, container_ids, pod_ids)
     )
     # Dedupe test cases