Remove compatibility code for Python < 3.7

Author: michael-k

aws_xray_sdk/core/__init__.py

@@ -1,13 +1,8 @@
+from .async_recorder import AsyncAWSXRayRecorder
+from .patcher import patch, patch_all
 from .recorder import AWSXRayRecorder
-from .patcher import patch_all, patch
-from .utils.compat import PY35
 
-
-if not PY35:
-    xray_recorder = AWSXRayRecorder()
-else:
-    from .async_recorder import AsyncAWSXRayRecorder
-    xray_recorder = AsyncAWSXRayRecorder()
+xray_recorder = AsyncAWSXRayRecorder()
 
 __all__ = [
     'patch',

aws_xray_sdk/core/async_context.py

@@ -1,11 +1,8 @@
 import asyncio
-import sys
 import copy
 
 from .context import Context as _Context
 
-_GTE_PY37 = sys.version_info.major == 3 and sys.version_info.minor >= 7
-
 
 class AsyncContext(_Context):
     """
@@ -51,10 +48,7 @@ def __setattr__(self, name, value):
 
         else:
             # Set task local attributes
-            if _GTE_PY37:
-                task = asyncio.current_task(loop=self._loop)
-            else:
-                task = asyncio.Task.current_task(loop=self._loop)
+            task = asyncio.current_task(loop=self._loop)
             if task is None:
                 return None
 
@@ -68,10 +62,7 @@ def __getattribute__(self, item):
             # Return references to local objects
             return object.__getattribute__(self, item)
 
-        if _GTE_PY37:
-            task = asyncio.current_task(loop=self._loop)
-        else:
-            task = asyncio.Task.current_task(loop=self._loop)
+        task = asyncio.current_task(loop=self._loop)
         if task is None:
             return None
 
@@ -82,10 +73,7 @@ def __getattribute__(self, item):
 
     def clear(self):
         # If were in a task, clear the context dictionary
-        if _GTE_PY37:
-            task = asyncio.current_task(loop=self._loop)
-        else:
-            task = asyncio.Task.current_task(loop=self._loop)
+        task = asyncio.current_task(loop=self._loop)
         if task is not None and hasattr(task, 'context'):
             task.context.clear()
 
@@ -104,10 +92,7 @@ def task_factory(loop, coro):
         del task._source_traceback[-1]  # flake8: noqa
 
     # Share context with new task if possible
-    if _GTE_PY37:
-        current_task = asyncio.current_task(loop=loop)
-    else:
-        current_task = asyncio.Task.current_task(loop=loop)
+    current_task = asyncio.current_task(loop=loop)
     if current_task is not None and hasattr(current_task, 'context'):
         if current_task.context.get('entities'):
             # NOTE: (enowell) Because the `AWSXRayRecorder`'s `Context` decides

aws_xray_sdk/core/patcher.py

@@ -8,7 +8,7 @@
 import wrapt
 
 from aws_xray_sdk import global_sdk_config
-from .utils.compat import PY2, is_classmethod, is_instance_method
+from .utils.compat import is_classmethod, is_instance_method
 
 log = logging.getLogger(__name__)
 
@@ -55,17 +55,14 @@ def patch_all(double_patch=False):
 
 def _is_valid_import(module):
     module = module.replace('.', '/')
-    if PY2:
-        return bool(pkgutil.get_loader(module))
-    else:
-        realpath = os.path.realpath(module)
-        is_module = os.path.isdir(realpath) and (
-            os.path.isfile('{}/__init__.py'.format(module)) or os.path.isfile('{}/__init__.pyc'.format(module))
-        )
-        is_file = not is_module and (
-                os.path.isfile('{}.py'.format(module)) or os.path.isfile('{}.pyc'.format(module))
-        )
-        return is_module or is_file
+    realpath = os.path.realpath(module)
+    is_module = os.path.isdir(realpath) and (
+        os.path.isfile('{}/__init__.py'.format(module)) or os.path.isfile('{}/__init__.pyc'.format(module))
+    )
+    is_file = not is_module and (
+            os.path.isfile('{}.py'.format(module)) or os.path.isfile('{}.pyc'.format(module))
+    )
+    return is_module or is_file
 
 
 def patch(modules_to_patch, raise_errors=True, ignore_module_patterns=None):

aws_xray_sdk/core/plugins/ec2_plugin.py

@@ -1,13 +1,6 @@
 import json
 import logging
-
-from aws_xray_sdk.core.utils.compat import PY2
-
-if PY2:
-    from future.standard_library import install_aliases
-    install_aliases()
-
-from urllib.request import urlopen, Request
+from urllib.request import Request, urlopen
 
 log = logging.getLogger(__name__)
 

aws_xray_sdk/core/sampling/connector.py

@@ -10,7 +10,6 @@
 from .sampling_rule import SamplingRule
 from aws_xray_sdk.core.models.dummy_entities import DummySegment
 from aws_xray_sdk.core.context import Context
-from aws_xray_sdk.core.utils.compat import PY2
 
 
 class ServiceConnector:
@@ -137,16 +136,8 @@ def _dt_to_epoch(self, dt):
         """
         Convert a offset-aware datetime to POSIX time.
         """
-        if PY2:
-            # The input datetime is from botocore unmarshalling and it is
-            # offset-aware so the timedelta of subtracting this time
-            # to 01/01/1970 using the same tzinfo gives us
-            # Unix Time (also known as POSIX Time).
-            time_delta = dt - datetime(1970, 1, 1).replace(tzinfo=dt.tzinfo)
-            return int(time_delta.total_seconds())
-        else:
-            # Added in python 3.3+ and directly returns POSIX time.
-            return int(dt.timestamp())
+        # Added in python 3.3+ and directly returns POSIX time.
+        return int(dt.timestamp())
 
     def _is_rule_valid(self, record):
         # We currently only handle v1 sampling rules.

aws_xray_sdk/core/utils/compat.py

@@ -1,16 +1,7 @@
 import inspect
-import sys
 
-
-PY2 = sys.version_info < (3,)
-PY35 = sys.version_info >= (3, 5)
-
-if PY2:
-    annotation_value_types = (int, long, float, bool, str, unicode)  # noqa: F821
-    string_types = basestring  # noqa: F821
-else:
-    annotation_value_types = (int, float, bool, str)
-    string_types = str
+annotation_value_types = (int, float, bool, str)
+string_types = str
 
 
 def is_classmethod(func):

aws_xray_sdk/ext/httplib/patch.py

@@ -1,24 +1,17 @@
-from collections import namedtuple
-import sys
-import wrapt
 import fnmatch
+from collections import namedtuple
+
 import urllib3.connection
+import wrapt
 
 from aws_xray_sdk.core import xray_recorder
-from aws_xray_sdk.core.models import http
 from aws_xray_sdk.core.exceptions.exceptions import SegmentNotFoundException
+from aws_xray_sdk.core.models import http
 from aws_xray_sdk.core.patcher import _PATCHED_MODULES
-from aws_xray_sdk.ext.util import inject_trace_header, strip_url, unwrap, get_hostname
-
-if sys.version_info >= (3, 0, 0):
-    PY2 = False
-    httplib_client_module = 'http.client'
-    import http.client as httplib
-else:
-    PY2 = True
-    httplib_client_module = 'httplib'
-    import httplib
+from aws_xray_sdk.ext.util import get_hostname, inject_trace_header, strip_url, unwrap
 
+httplib_client_module = 'http.client'
+import http.client as httplib
 
 _XRAY_PROP = '_xray_prop'
 _XRay_Data = namedtuple('xray_data', ['method', 'host', 'url'])
@@ -72,10 +65,6 @@ def http_response_processor(wrapped, instance, args, kwargs, return_value,
 
 
 def _xray_traced_http_getresponse(wrapped, instance, args, kwargs):
-    if not PY2 and kwargs.get('buffering', False):
-        # ignore py2 calls that fail as 'buffering` only exists in py2.
-        return wrapped(*args, **kwargs)
-
     xray_data = getattr(instance, _XRAY_PROP, None)
     if not xray_data:
         return wrapped(*args, **kwargs)

aws_xray_sdk/ext/sqlalchemy/util/decorators.py

@@ -1,18 +1,12 @@
 import re
 import types
+from urllib.parse import urlparse, uses_netloc
+
+from sqlalchemy.engine.base import Connection
 
 from aws_xray_sdk.core import xray_recorder
 from aws_xray_sdk.ext.util import strip_url
 
-from aws_xray_sdk.core.utils.compat import PY2
-
-if PY2:
-    from future.standard_library import install_aliases
-    install_aliases()
-
-from urllib.parse import urlparse, uses_netloc
-from sqlalchemy.engine.base import Connection
-
 
 def decorate_all_functions(function_decorator):
     def decorator(cls):

aws_xray_sdk/ext/sqlalchemy_core/patch.py

@@ -1,20 +1,15 @@
 import logging
 import sys
-
-if sys.version_info >= (3, 0, 0):
-    from urllib.parse import urlparse, uses_netloc
-else:
-    from urlparse import urlparse, uses_netloc
+from urllib.parse import urlparse, uses_netloc
 
 import wrapt
+from sqlalchemy.sql.expression import ClauseElement
 
 from aws_xray_sdk.core import xray_recorder
 from aws_xray_sdk.core.patcher import _PATCHED_MODULES
 from aws_xray_sdk.core.utils import stacktrace
 from aws_xray_sdk.ext.util import unwrap
 
-from sqlalchemy.sql.expression import ClauseElement
-
 
 def _sql_meta(engine_instance, args):
     try:

aws_xray_sdk/ext/util.py

@@ -1,16 +1,10 @@
 import re
-
-from aws_xray_sdk.core.models.trace_header import TraceHeader
-from aws_xray_sdk.core.models import http
+from urllib.parse import urlparse
 
 import wrapt
-import sys
-
-if sys.version_info.major >= 3:  # Python 3 and above
-    from urllib.parse import urlparse
-else:  # Python 2 and below
-    from urlparse import urlparse
 
+from aws_xray_sdk.core.models import http
+from aws_xray_sdk.core.models.trace_header import TraceHeader
 
 first_cap_re = re.compile('(.)([A-Z][a-z]+)')
 all_cap_re = re.compile('([a-z0-9])([A-Z])')

tests/ext/aiohttp/test_middleware.py

@@ -5,22 +5,18 @@
 """
 import asyncio
 import sys
-from aws_xray_sdk import global_sdk_config
-try:
-    from unittest.mock import patch
-except ImportError:
-    # NOTE: Python 2 dependency
-    from mock import patch
+from unittest.mock import patch
 
+import pytest
 from aiohttp import web
 from aiohttp.web_exceptions import HTTPUnauthorized
-import pytest
 
-from aws_xray_sdk.core.emitters.udp_emitter import UDPEmitter
+from aws_xray_sdk import global_sdk_config
 from aws_xray_sdk.core.async_context import AsyncContext
+from aws_xray_sdk.core.emitters.udp_emitter import UDPEmitter
 from aws_xray_sdk.core.models import http
-from tests.util import get_new_stubbed_recorder
 from aws_xray_sdk.ext.aiohttp.middleware import middleware
+from tests.util import get_new_stubbed_recorder
 
 
 class CustomStubbedEmitter(UDPEmitter):

tests/ext/django/test_settings.py

@@ -1,15 +1,11 @@
-try:
-    from unittest import mock
-except ImportError:
-    # NOTE: Python 2 dependency
-    import mock
+from unittest import mock
 
 import django
-from aws_xray_sdk import global_sdk_config
-from django.test import TestCase, override_settings
-from django.conf import settings
 from django.apps import apps
+from django.conf import settings
+from django.test import TestCase, override_settings
 
+from aws_xray_sdk import global_sdk_config
 from aws_xray_sdk.core import xray_recorder
 from aws_xray_sdk.core.sampling.sampler import LocalSampler
 

tests/ext/httplib/test_httplib.py

@@ -1,18 +1,11 @@
+import http.client as httplib
+from urllib.parse import urlparse
+
 import pytest
-import sys
 
-from aws_xray_sdk.core import patch
-from aws_xray_sdk.core import xray_recorder
+from aws_xray_sdk.core import patch, xray_recorder
 from aws_xray_sdk.core.context import Context
-from aws_xray_sdk.ext.util import strip_url, get_hostname
-
-if sys.version_info >= (3, 0, 0):
-    import http.client as httplib
-    from urllib.parse import urlparse
-else:
-    import httplib
-    from urlparse import urlparse
-
+from aws_xray_sdk.ext.util import get_hostname, strip_url
 
 # httpbin.org is created by the same author of requests to make testing http easy.
 BASE_URL = 'httpbin.org'
@@ -25,7 +18,7 @@ def construct_ctx():
     so that later subsegment can be attached. After each test run
     it cleans up context storage again.
     """
-    from aws_xray_sdk.ext.httplib import unpatch, reset_ignored
+    from aws_xray_sdk.ext.httplib import reset_ignored, unpatch
 
     patch(('httplib',))
     xray_recorder.configure(service='test', sampling=False, context=Context())

tests/test_plugins.py

@@ -1,9 +1,6 @@
+from unittest.mock import patch
+
 from aws_xray_sdk.core.plugins.utils import get_plugin_modules
-try:
-    from unittest.mock import patch
-except ImportError:
-    # NOTE: Python 2 dependency
-    from mock import patch
 
 supported_plugins = (
     'ec2_plugin',