Remove six usage (#310)

Signed-off-by: George Leman <[email protected]>

Author: cedy

jaeger_client/codecs.py

@@ -29,8 +29,7 @@
 from .span_context import SpanContext
 from .constants import SAMPLED_FLAG, DEBUG_FLAG
 
-import six
-from six.moves import urllib_parse
+import urllib.parse
 
 
 class Codec(object):
@@ -65,14 +64,14 @@ def inject(self, span_context, carrier):
             parent_id=span_context.parent_id, flags=span_context.flags)
         baggage = span_context.baggage
         if baggage:
-            for key, value in six.iteritems(baggage):
+            for key, value in baggage.items():
                 encoded_key = key
-                if isinstance(key, six.binary_type):
+                if isinstance(key, (bytes,)):
                     encoded_key = str(key, 'utf-8')
                 if self.url_encoding:
-                    encoded_value = urllib_parse.quote(value)
+                    encoded_value = urllib.parse.quote(value)
                 else:
-                    if isinstance(value, six.binary_type):
+                    if isinstance(key, (bytes,)):
                         encoded_value = str(value, 'utf-8')
                     else:
                         encoded_value = value
@@ -87,28 +86,28 @@ def extract(self, carrier):
         trace_id, span_id, parent_id, flags = None, None, None, None
         baggage = None
         debug_id = None
-        for key, value in six.iteritems(carrier):
+        for key, value in carrier.items():
             uc_key = key.lower()
             if uc_key == self.trace_id_header:
                 if self.url_encoding:
-                    value = urllib_parse.unquote(value)
+                    value = urllib.parse.unquote(value)
                 trace_id, span_id, parent_id, flags = \
                     span_context_from_string(value)
             elif uc_key.startswith(self.baggage_prefix):
                 if self.url_encoding:
-                    value = urllib_parse.unquote(value)
+                    value = urllib.parse.unquote(value)
                 attr_key = key[self.prefix_length:]
                 if baggage is None:
                     baggage = {attr_key.lower(): value}
                 else:
                     baggage[attr_key.lower()] = value
             elif uc_key == self.debug_id_header:
                 if self.url_encoding:
-                    value = urllib_parse.unquote(value)
+                    value = urllib.parse.unquote(value)
                 debug_id = value
             elif uc_key == self.baggage_header:
                 if self.url_encoding:
-                    value = urllib_parse.unquote(value)
+                    value = urllib.parse.unquote(value)
                 baggage = self._parse_baggage_header(value, baggage)
         if not trace_id or not span_id:
             # reset all IDs
@@ -235,7 +234,7 @@ def span_context_from_string(value):
             raise SpanContextCorruptedException(
                 'trace context must be a string or array of 1: "%s"' % value)
         value = value[0]
-    if not isinstance(value, six.string_types):
+    if not isinstance(value, (str,)):
         raise SpanContextCorruptedException(
             'trace context not a string "%s"' % value)
     parts = value.split(':')
@@ -307,7 +306,7 @@ def extract(self, carrier):
 
 
 def header_to_hex(header):
-    if not isinstance(header, (str, six.text_type)):
+    if not isinstance(header, (str,)):
         raise SpanContextCorruptedException(
             'malformed trace context "%s", expected hex string' % header)
 
@@ -352,7 +351,7 @@ def extract(self, carrier):
             raise InvalidCarrierException('carrier not a dictionary')
         trace_id = span_id = parent_id = None
         flags = 0x00
-        for header_key, header_value in six.iteritems(carrier):
+        for header_key, header_value in carrier.items():
             if header_value is None:
                 continue
             lower_key = header_key.lower()

jaeger_client/constants.py

@@ -16,7 +16,6 @@
 
 from . import __version__
 
-import six
 
 # DEPRECATED: max number of bits to use when generating random ID
 MAX_ID_BITS = 64
@@ -34,10 +33,10 @@
 DEFAULT_FLUSH_INTERVAL = 1
 
 # Name of the HTTP header used to encode trace ID
-TRACE_ID_HEADER = 'uber-trace-id' if six.PY3 else b'uber-trace-id'
+TRACE_ID_HEADER = 'uber-trace-id'
 
 # Prefix for HTTP headers used to record baggage items
-BAGGAGE_HEADER_PREFIX = 'uberctx-' if six.PY3 else b'uberctx-'
+BAGGAGE_HEADER_PREFIX = 'uberctx-'
 
 # The name of HTTP header or a TextMap carrier key which, if found in the
 # carrier, forces the trace to be sampled as "debug" trace. The value of the

jaeger_client/metrics/metrics.py

@@ -15,8 +15,6 @@
 from __future__ import absolute_import
 from __future__ import division
 
-import six
-
 
 class MetricsFactory(object):
     """Generates new metrics."""
@@ -90,7 +88,7 @@ def _get_key(self, name, tags=None):
         if not tags:
             return name
         key = name
-        for k in sorted(six.iterkeys(tags)):
+        for k in sorted(tags.keys()):
             key = key + '.' + str(k) + '_' + str(tags[k])
         return key
 

jaeger_client/sampler.py

@@ -17,7 +17,6 @@
 import json
 import logging
 import random
-import six
 
 from threading import Lock
 from tornado.ioloop import PeriodicCallback
@@ -316,7 +315,7 @@ def update(self, strategies):
                 ProbabilisticSampler(self.default_sampling_probability)
 
     def close(self):
-        for _, sampler in six.iteritems(self.samplers):
+        for _, sampler in self.samplers.items():
             sampler.close()
 
     def __str__(self):

jaeger_client/span.py

@@ -14,7 +14,6 @@
 
 from __future__ import absolute_import
 
-import six
 import threading
 import time
 import logging
@@ -47,7 +46,7 @@ def __init__(self, context, tracer, operation_name,
         self.tags = []
         self.logs = []
         if tags:
-            for k, v in six.iteritems(tags):
+            for k, v in tags.items():
                 self.set_tag(k, v)
 
     def set_operation_name(self, operation_name):

jaeger_client/thrift.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import traceback
-import six
 from opentracing.tracer import ReferenceType
 from .constants import MAX_TRACEBACK_LENGTH
 
@@ -25,9 +24,6 @@
 _max_signed_id = (1 << 63) - 1
 _max_unsigned_id = (1 << 64)
 
-if six.PY3:
-    long = int
-
 
 def _id_to_low(big_id):
     """
@@ -147,20 +143,20 @@ def _make_bool_tag(key, value):
 
 def timestamp_micros(ts):
     """
-    Convert a float Unix timestamp from time.time() into a long value
+    Convert a float Unix timestamp from time.time() into a int value
     in microseconds, as required by Zipkin protocol.
     :param ts:
     :return:
     """
-    return long(ts * 1000000)
+    return int(ts * 1000000)
 
 
 def make_tags(tags, max_length, max_traceback_length):
     # TODO extend to support non-string tag values
     return [
         make_tag(key=k, value=v, max_length=max_length,
                  max_traceback_length=max_traceback_length)
-        for k, v in six.iteritems(tags or {})
+        for k, v in (tags or {}).items()
     ]
 
 

jaeger_client/tracer.py

@@ -21,7 +21,6 @@
 import random
 import sys
 import time
-import six
 import opentracing
 from opentracing import Format, UnsupportedFormatException
 from opentracing.ext import tags as ext_tags
@@ -183,7 +182,7 @@ def start_span(self,
                 if sampled:
                     flags = SAMPLED_FLAG
                     tags = tags or {}
-                    for k, v in six.iteritems(sampler_tags):
+                    for k, v in sampler_tags.items():
                         tags[k] = v
             elif parent.debug_id and self.is_debug_allowed(operation_name):
                 flags = SAMPLED_FLAG | DEBUG_FLAG

jaeger_client/utils.py

@@ -16,7 +16,6 @@
 import struct
 
 import time
-from six.moves import range
 
 
 class ErrorReporter(object):

tests/test_codecs.py

@@ -17,7 +17,6 @@
 import unittest
 from collections import namedtuple
 from itertools import product
-import six
 
 import mock
 import pytest
@@ -137,7 +136,7 @@ def test_context_to_readable_headers(self):
                     'trace-attr-key2': 'cafe',
                     'trace-attr-key3': '%F0%9F%91%BE',
                 }, 'with url_encoding = %s' % url_encoding
-                for key, val in six.iteritems(carrier):
+                for key, val in carrier.items():
                     assert isinstance(key, str)
                     assert isinstance(val, str), '%s' % type(val)
             else:
@@ -522,7 +521,7 @@ def _test_baggage_without_trace_id(tracer, trace_id_header, baggage_header_prefi
         span = tracer.start_span('test', child_of=span_context)
         assert span.context.baggage == match
         # also check baggage through API
-        for k, v in six.iteritems(match):
+        for k, v in match.items():
             assert span.get_baggage_item(k) == v
 
 

tests/test_rate_limiter.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from six.moves import range
 import time
 import mock