Decode bytestring to utf8; Add py3 basestring equivalent

Author: pglombardo

instana/util.py

@@ -4,6 +4,12 @@
 import struct
 import binascii
 
+import sys
+if sys.version_info.major is 2:
+    string_types = basestring
+else:
+    string_types = str
+
 _rnd = random.Random()
 _current_pid = 0
 
@@ -26,13 +32,13 @@ def id_to_header(id):
         return ""
 
     byteString = struct.pack('>q', id)
-    return binascii.hexlify(byteString).lstrip('0')
+    return binascii.hexlify(byteString).decode('UTF-8').lstrip('0')
 
 
 def header_to_id(header):
     """ Convert an unsigned base 16 hex string into a 64bit signed integer """
 
-    if not isinstance(header, basestring):
+    if not isinstance(header, string_types):
         return 0
 
     # Pad the header to 16 chars

tests/test_id_management.py

@@ -1,6 +1,12 @@
 import instana.util
 import string
 from nose.tools import assert_equals
+import sys
+
+if sys.version_info.major is 2:
+    string_types = basestring
+else:
+    string_types = str
 
 
 def test_id_generation():
@@ -72,15 +78,15 @@ def test_id_to_header_conversion():
     converted_id = instana.util.id_to_header(original_id)
 
     # Assert that it is a string and there are no non-hex characters
-    assert isinstance(converted_id, basestring)
+    assert isinstance(converted_id, string_types)
     assert all(c in string.hexdigits for c in converted_id)
 
     # Test passing a standard Integer ID as a String
     original_id = instana.util.generate_id()
     converted_id = instana.util.id_to_header(original_id)
 
     # Assert that it is a string and there are no non-hex characters
-    assert isinstance(converted_id, basestring)
+    assert isinstance(converted_id, string_types)
     assert all(c in string.hexdigits for c in converted_id)
 
 
@@ -89,21 +95,21 @@ def test_id_to_header_conversion_with_bogus_id():
     converted_id = instana.util.id_to_header('')
 
     # Assert that it is a string and there are no non-hex characters
-    assert isinstance(converted_id, basestring)
+    assert isinstance(converted_id, string_types)
     assert converted_id == ''
 
     # Test passing a nil
     converted_id = instana.util.id_to_header(None)
 
     # Assert that it is a string and there are no non-hex characters
-    assert isinstance(converted_id, basestring)
+    assert isinstance(converted_id, string_types)
     assert converted_id == ''
 
     # Test passing an Array
     converted_id = instana.util.id_to_header([])
 
     # Assert that it is a string and there are no non-hex characters
-    assert isinstance(converted_id, basestring)
+    assert isinstance(converted_id, string_types)
     assert converted_id == ''