- fix: unittest.skipIf, unittest.skipUnless

- remove PY2

Signed-off-by: Varsha GS <[email protected]>

Author: GSVarsha

instana/collector/base.py

@@ -13,10 +13,7 @@
 from ..util import every, DictionaryOfStan
 
 
-if sys.version_info.major == 2:
-    import Queue as queue
-else:
-    import queue # pylint: disable=import-error
+import queue # pylint: disable=import-error
 
 
 class BaseCollector(object):

instana/propagators/base_propagator.py

@@ -3,16 +3,13 @@
 
 
 import sys
+import os
 
 from instana.log import logger
 from instana.util.ids import header_to_id, header_to_long_id
 from instana.span_context import SpanContext
 from instana.w3c_trace_context.traceparent import Traceparent
 from instana.w3c_trace_context.tracestate import Tracestate
-import os
-
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
 
 
 # The carrier can be a dict or a list.
@@ -233,7 +230,7 @@ def __extract_instana_headers(self, dc):
 
             level = dc.get(self.LC_HEADER_KEY_L) or dc.get(self.ALT_LC_HEADER_KEY_L) or dc.get(
                 self.B_HEADER_KEY_L) or dc.get(self.B_ALT_LC_HEADER_KEY_L)
-            if level and PY3 is True and isinstance(level, bytes):
+            if level and isinstance(level, bytes):
                 level = level.decode("utf-8")
 
             synthetic = dc.get(self.LC_HEADER_KEY_SYNTHETIC) or dc.get(self.ALT_LC_HEADER_KEY_SYNTHETIC) or dc.get(
@@ -258,12 +255,12 @@ def __extract_w3c_trace_context_headers(self, dc):
         try:
             traceparent = dc.get(self.HEADER_KEY_TRACEPARENT) or dc.get(self.ALT_HEADER_KEY_TRACEPARENT) or dc.get(
                 self.B_HEADER_KEY_TRACEPARENT) or dc.get(self.B_ALT_HEADER_KEY_TRACEPARENT)
-            if traceparent and PY3 is True and isinstance(traceparent, bytes):
+            if traceparent and isinstance(traceparent, bytes):
                 traceparent = traceparent.decode("utf-8")
 
             tracestate = dc.get(self.HEADER_KEY_TRACESTATE) or dc.get(self.ALT_HEADER_KEY_TRACESTATE) or dc.get(
                 self.B_HEADER_KEY_TRACESTATE) or dc.get(self.B_ALT_HEADER_KEY_TRACESTATE)
-            if tracestate and PY3 is True and isinstance(tracestate, bytes):
+            if tracestate and isinstance(tracestate, bytes):
                 tracestate = tracestate.decode("utf-8")
 
         except Exception:

instana/util/__init__.py

@@ -2,7 +2,6 @@
 # (c) Copyright Instana Inc. 2020
 
 import json
-import sys
 import time
 
 from collections import defaultdict
@@ -16,14 +15,6 @@
 
 from ..log import logger
 
-if sys.version_info.major == 2:
-    string_types = basestring
-else:
-    string_types = str
-
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
 def nested_dictionary():
     return defaultdict(DictionaryOfStan)
 

instana/util/ids.py

@@ -2,7 +2,6 @@
 # (c) Copyright Instana Inc. 2020
 
 import os
-import sys
 import time
 import random
 
@@ -11,13 +10,7 @@
 
 BAD_ID = "BADCAFFE"  # Bad Caffe
 
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-if PY2:
-    string_types = basestring
-else:
-    string_types = str
+string_types = str
 
 
 def generate_id():
@@ -45,7 +38,7 @@ def header_to_long_id(header):
     :param header: the header to analyze, validate and convert (if needed)
     :return: a valid ID to be used internal to the tracer
     """
-    if PY3 is True and isinstance(header, bytes):
+    if isinstance(header, bytes):
         header = header.decode('utf-8')
 
     if not isinstance(header, string_types):
@@ -74,7 +67,7 @@ def header_to_id(header):
     :param header: the header to analyze, validate and convert (if needed)
     :return: a valid ID to be used internal to the tracer
     """
-    if PY3 is True and isinstance(header, bytes):
+    if isinstance(header, bytes):
         header = header.decode('utf-8')
 
     if not isinstance(header, string_types):

tests/clients/test_cassandra-driver.py

@@ -28,7 +28,7 @@
                 ");")
 
 
-@unittest.mark.skipif(not os.environ.get("CASSANDRA_TEST"), reason="")
+@unittest.skipUnless(os.environ.get("CASSANDRA_TEST"), reason="")
 class TestCassandra(unittest.TestCase):
     def setUp(self):
         """ Clear all spans before a test run """

tests/clients/test_couchbase.py

@@ -26,7 +26,7 @@
     pass
 
 
-@unittest.mark.skipif(not os.environ.get("COUCHBASE_TEST"), reason="")
+@unittest.skipIf(not os.environ.get("COUCHBASE_TEST"), reason="")
 class TestStandardCouchDB(unittest.TestCase):
     def setup_class(self):
         """ Clear all spans before a test run """

tests/clients/test_google-cloud-storage.py

@@ -21,7 +21,7 @@ def setUp(self):
         self.recorder = tracer.recorder
         self.recorder.clear_spans()
 
-    @unittest.mark.skipif(sys.platform == "darwin", reason="Raises not Implemented exception in OSX")
+    @unittest.skipIf(sys.platform == "darwin", reason="Raises not Implemented exception in OSX")
     @patch('requests.Session.request')
     def test_buckets_list(self, mock_requests):
         mock_requests.return_value = self._mock_response(
@@ -510,7 +510,7 @@ def test_objects_insert(self, mock_requests):
         self.assertEqual('test bucket', gcs_span.data["gcs"]["bucket"])
         self.assertEqual('test object', gcs_span.data["gcs"]["object"])
 
-    @unittest.mark.skipif(sys.platform == "darwin", reason="Raises not Implemented exception in OSX")
+    @unittest.skipIf(sys.platform == "darwin", reason="Raises not Implemented exception in OSX")
     @patch('requests.Session.request')
     def test_objects_list(self, mock_requests):
         mock_requests.return_value = self._mock_response(
@@ -784,7 +784,7 @@ def test_object_hmac_keys_get(self, mock_requests):
         self.assertEqual('test-project', gcs_span.data["gcs"]["projectId"])
         self.assertEqual('test key', gcs_span.data["gcs"]["accessId"])
 
-    @unittest.mark.skipif(sys.platform == "darwin", reason="Raises not Implemented exception in OSX")
+    @unittest.skipIf(sys.platform == "darwin", reason="Raises not Implemented exception in OSX")
     @patch('requests.Session.request')
     def test_object_hmac_keys_list(self, mock_requests):
         mock_requests.return_value = self._mock_response(

tests/clients/test_pymongo.py

@@ -13,7 +13,7 @@
 
 logger = logging.getLogger(__name__)
 
-pymongoversion = unittest.mark.skipif(
+pymongoversion = unittest.skipIf(
     pymongo.version_tuple >= (4, 0), reason="map reduce is removed in pymongo 4.0"
 )
 

tests/conftest.py

@@ -27,13 +27,13 @@
 
 # Python 3.10 support is incomplete yet
 # TODO: Remove this once we start supporting Tornado >= 6.0
-if sys.version_info.minor >= 10:
+if sys.version_info >= (3, 10):
     collect_ignore_glob.append("*test_tornado*")
     # Furthermore on Python 3.11 the above TC is skipped:
     # tests/opentracing/test_ot_span.py::TestOTSpan::test_stacks
     # TODO: Remove that once we find a workaround or DROP opentracing!
 
-if sys.version_info.minor >= 12:
+if sys.version_info >= (3, 12):
     # Currently the dependencies of sanic and aiohttp are not installable on 3.12
     # PyLongObject’ {aka ‘struct _longobject’} has no member named ‘ob_digit’
     collect_ignore_glob.append("*test_sanic*")

tests/frameworks/test_flask.py

@@ -1,7 +1,6 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2020
 
-import sys
 import unittest
 import urllib3
 import flask
@@ -713,10 +712,7 @@ def test_exception(self):
         # error log
         self.assertEqual("log", log_span.n)
         self.assertEqual('Exception on /exception [GET]', log_span.data["log"]['message'])
-        if sys.version_info < (3, 0):
-            self.assertEqual("<type 'exceptions.Exception'> fake error", log_span.data["log"]['parameters'])
-        else:
-            self.assertEqual("<class 'Exception'> fake error", log_span.data["log"]['parameters'])
+        self.assertEqual("<class 'Exception'> fake error", log_span.data["log"]['parameters'])
 
 
         # wsgis