remove urlparse

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

Author: GSVarsha

example/autoprofile/app.py

@@ -4,7 +4,6 @@
 import time
 import threading
 import random
-import traceback
 import sys
 import os
 
@@ -13,14 +12,6 @@
 os.environ['INSTANA_AUTOPROFILE'] = 'yes'
 import instana
 
-try:
-    # python 2
-    from urllib2 import urlopen
-except ImportError:
-    # python 3
-    from urllib.request import urlopen
-
-
 # Simulate CPU intensive work
 def simulate_cpu():
     for i in range(5000000):

instana/instrumentation/celery/hooks.py

@@ -3,6 +3,7 @@
 
 
 import opentracing
+
 from ...log import logger
 from ...singletons import tracer
 from ...util.traceutils import get_active_tracer
@@ -12,11 +13,7 @@
     from celery import registry, signals
     from .catalog import task_catalog_get, task_catalog_pop, task_catalog_push, get_task_id
 
-    try:
-        from urllib import parse
-    except ImportError:
-        import urlparse as parse
-        import urllib
+    from urllib import parse
 
 
     def add_broker_tags(span, broker_url):

instana/instrumentation/django/middleware.py

@@ -108,11 +108,7 @@ def process_exception(self, request, exception):
 
     def __url_pattern_route(self, view_name):
         from django.conf import settings
-        try:
-            from django.urls import RegexURLPattern as URLPattern
-            from django.urls import RegexURLResolver as URLResolver
-        except ImportError:
-            from django.urls import URLPattern, URLResolver
+        from django.urls import RegexURLResolver as URLResolver
 
         urlconf = __import__(settings.ROOT_URLCONF, {}, {}, [''])
 

instana/instrumentation/google/cloud/collectors.py

@@ -2,13 +2,7 @@
 # (c) Copyright Instana Inc. 2020
 
 import re
-
-try:
-    # Python 3
-    from urllib.parse import unquote
-except ImportError:
-    # Python 2
-    from urllib import unquote
+from urllib.parse import unquote
 
 # _storage_api defines a conversion of Google Storage JSON API requests into span tags as follows:
 #   request_method -> path_matcher -> collector

instana/util/__init__.py

@@ -3,15 +3,10 @@
 
 import json
 import time
-
 from collections import defaultdict
-import pkg_resources
+from urllib import parse
 
-try:
-    from urllib import parse
-except ImportError:
-    import urlparse as parse
-    import urllib
+import pkg_resources
 
 from ..log import logger
 

instana/util/ids.py

@@ -10,8 +10,6 @@
 
 BAD_ID = "BADCAFFE"  # Bad Caffe
 
-string_types = str
-
 
 def generate_id():
     """ Generate a 64bit base 16 ID for use as a Span or Trace ID """
@@ -41,7 +39,7 @@ def header_to_long_id(header):
     if isinstance(header, bytes):
         header = header.decode('utf-8')
 
-    if not isinstance(header, string_types):
+    if not isinstance(header, str):
         return BAD_ID
 
     try:
@@ -70,7 +68,7 @@ def header_to_id(header):
     if isinstance(header, bytes):
         header = header.decode('utf-8')
 
-    if not isinstance(header, string_types):
+    if not isinstance(header, str):
         return BAD_ID
 
     try:

instana/util/secrets.py

@@ -2,16 +2,8 @@
 # (c) Copyright Instana Inc. 2020
 
 import re
-import re
-import sys
-
-try:
-    from urllib import parse
-except ImportError:
-    import urlparse as parse
-    import urllib
+from urllib import parse
 
-from ..util import PY2, PY3
 from ..log import logger
 
 
@@ -127,10 +119,7 @@ def strip_secrets_from_query(qp, matcher, kwlist):
             logger.debug("strip_secrets_from_query: unknown matcher")
             return qp
 
-        if PY2:
-            result = urllib.urlencode(params, doseq=True)
-        else:
-            result = parse.urlencode(params, doseq=True)
+        result = parse.urlencode(params, doseq=True)
         query = parse.unquote(result)
 
         if path: