Remove string_types from compat module

Author: michael-k

aws_xray_sdk/core/models/entity.py

@@ -6,7 +6,7 @@
 
 import json
 
-from ..utils.compat import annotation_value_types, string_types
+from ..utils.compat import annotation_value_types
 from ..utils.conversion import metadata_to_dict
 from .throwable import Throwable
 from . import http
@@ -113,7 +113,7 @@ def put_http_meta(self, key, value):
             return
 
         if key == http.STATUS:
-            if isinstance(value, string_types):
+            if isinstance(value, str):
                 value = int(value)
             self.apply_status_code(value)
 
@@ -139,7 +139,7 @@ def put_annotation(self, key, value):
         """
         self._check_ended()
 
-        if not isinstance(key, string_types):
+        if not isinstance(key, str):
             log.warning("ignoring non string type annotation key with type %s.", type(key))
             return
 
@@ -165,7 +165,7 @@ def put_metadata(self, key, value, namespace='default'):
         """
         self._check_ended()
 
-        if not isinstance(namespace, string_types):
+        if not isinstance(namespace, str):
             log.warning("ignoring non string type metadata namespace")
             return
 
@@ -271,7 +271,7 @@ def serialize(self):
     def to_dict(self):
         """
         Convert Entity(Segment/Subsegment) object to dict
-        with required properties that have non-empty values. 
+        with required properties that have non-empty values.
         """
         entity_dict = {}
 

aws_xray_sdk/core/models/throwable.py

@@ -3,8 +3,6 @@
 import binascii
 import logging
 
-from ..utils.compat import string_types
-
 log = logging.getLogger(__name__)
 
 
@@ -31,7 +29,7 @@ def __init__(self, exception, stack, remote=False):
             message = None
 
         # do not record non-string exception message
-        if isinstance(message, string_types):
+        if isinstance(message, str):
             self.message = message
 
         self.type = type(exception).__name__

aws_xray_sdk/core/recorder.py

@@ -18,7 +18,6 @@
 from .plugins.utils import get_plugin_modules
 from .lambda_launcher import check_in_lambda
 from .exceptions.exceptions import SegmentNameMissingException, SegmentNotFoundException
-from .utils.compat import string_types
 from .utils import stacktrace
 
 log = logging.getLogger(__name__)
@@ -288,7 +287,7 @@ def _begin_subsegment_helper(self, name, namespace='local', beginWithoutSampling
         if not segment:
             log.warning("No segment found, cannot begin subsegment %s." % name)
             return None
-        
+
         current_entity = self.get_trace_entity()
         if not current_entity.sampled or beginWithoutSampling:
             subsegment = DummySubsegment(segment, name)
@@ -486,7 +485,7 @@ def _populate_runtime_context(self, segment, sampling_decision):
         segment.set_aws(copy.deepcopy(self._aws_metadata))
         segment.set_service(SERVICE_INFO)
 
-        if isinstance(sampling_decision, string_types):
+        if isinstance(sampling_decision, str):
             segment.set_rule_name(sampling_decision)
 
     def _send_segment(self):
@@ -562,7 +561,7 @@ def dynamic_naming(self):
 
     @dynamic_naming.setter
     def dynamic_naming(self, value):
-        if isinstance(value, string_types):
+        if isinstance(value, str):
             self._dynamic_naming = DefaultDynamicNaming(value, self.service)
         else:
             self._dynamic_naming = value

aws_xray_sdk/core/utils/compat.py

@@ -1,7 +1,6 @@
 import inspect
 
 annotation_value_types = (int, float, bool, str)
-string_types = str
 
 
 def is_classmethod(func):