{Misc} Remove various bits of Python 2.7 code

Author: atombrella

scripts/curl_install_pypi/install.py

@@ -23,19 +23,8 @@
 import shutil
 import subprocess
 import hashlib
-try:
-    # Attempt to load python 3 module
-    from urllib.request import urlopen
-except ImportError:
-    # Import python 2 version
-    from urllib2 import urlopen
-
-try:
-    # Rename raw_input to input to support Python 2
-    input = raw_input
-except NameError:
-    # Python 3 doesn't have raw_input
-    pass
+from urllib.request import urlopen
+
 
 AZ_DISPATCH_TEMPLATE = """#!/usr/bin/env bash
 {install_dir}/bin/python -m azure.cli "$@"

src/azure-cli-core/azure/cli/core/_help_loaders.py

@@ -15,14 +15,9 @@
 
 logger = get_logger(__name__)
 
-try:
-    ABC = abc.ABC
-except AttributeError:  # Python 2.7, abc exists, but not ABC
-    ABC = abc.ABCMeta('ABC', (object,), {'__slots__': ()})
-
 
 # BaseHelpLoader defining versioned loader interface. Also contains some helper methods.
-class BaseHelpLoader(ABC):
+class BaseHelpLoader(abc.ABC):
     def __init__(self, help_ctx=None):
         self.help_ctx = help_ctx
         self._entry_data = None

src/azure-cli-core/azure/cli/core/aaz/_operation.py

@@ -7,6 +7,8 @@
 
 import json
 
+from urllib.parse import quote
+
 from azure.core.exceptions import ClientAuthenticationError, ResourceExistsError, ResourceNotFoundError, \
     HttpResponseError
 from azure.cli.core.azclierror import InvalidArgumentValueError
@@ -19,10 +21,6 @@
 from ._field_value import AAZList, AAZObject, AAZBaseDictValue
 from .exceptions import AAZInvalidValueError
 
-try:
-    from urllib import quote  # type: ignore
-except ImportError:
-    from urllib.parse import quote  # type: ignore
 
 
 class AAZOperation:

src/azure-cli-core/azure/cli/core/commands/__init__.py

@@ -42,10 +42,7 @@
 from knack.events import EVENT_INVOKER_TRANSFORM_RESULT
 from knack.validators import DefaultStr
 
-try:
-    t_JSONDecodeError = json.JSONDecodeError
-except AttributeError:  # in Python 2.7
-    t_JSONDecodeError = ValueError
+t_JSONDecodeError = json.JSONDecodeError
 
 logger = get_logger(__name__)
 DEFAULT_CACHE_TTL = '10'
@@ -471,7 +468,7 @@ def _put_operation():
     obj_path = os.path.join(obj_dir, obj_file)
     try:
         os.remove(obj_path)
-    except (OSError, IOError):  # FileNotFoundError introduced in Python 3
+    except FileNotFoundError:
         pass
     return result
 

src/azure-cli-core/azure/cli/core/keys.py

@@ -16,11 +16,7 @@ def is_valid_ssh_rsa_public_key(openssh_pubkey):
     # http://stackoverflow.com/questions/2494450/ssh-rsa-public-key-validation-using-a-regular-expression # pylint: disable=line-too-long
     # A "good enough" check is to see if the key starts with the correct header.
     import struct
-    try:
-        from base64 import decodebytes as base64_decode
-    except ImportError:
-        # deprecated and redirected to decodebytes in Python 3
-        from base64 import decodestring as base64_decode
+    from base64 import decodestring as base64_decode
 
     parts = openssh_pubkey.split()
     if len(parts) < 2:

src/azure-cli-core/azure/cli/core/tests/test_aaz_prompt.py

@@ -7,10 +7,7 @@
 import random
 
 import unittest
-try:
-    import mock
-except ImportError:
-    from unittest import mock
+from unittest import mock
 
 from azure.cli.core import azclierror
 from azure.cli.core.aaz import exceptions as aazerror

src/azure-cli-telemetry/azure/cli/telemetry/components/telemetry_client.py

@@ -6,18 +6,12 @@
 import json
 import datetime
 
+import urllib.request as http_client_t
+from urllib.error import HTTPError
+
 from applicationinsights import TelemetryClient
 from applicationinsights.channel import SynchronousSender, SynchronousQueue, TelemetryChannel
 
-try:
-    # Python 2.x
-    import urllib2 as http_client_t
-    from urllib2 import HTTPError
-except ImportError:
-    # Python 3.x
-    import urllib.request as http_client_t
-    from urllib.error import HTTPError
-
 
 class CliTelemetryClient:
     def __init__(self, batch=100, sender=None):

src/azure-cli-telemetry/azure/cli/telemetry/tests/test_telemetry_client.py

@@ -8,16 +8,10 @@
 import os
 import unittest
 
-from applicationinsights.channel import SynchronousSender
+import urllib.request as http_client_t
+from urllib.error import HTTPError
 
-try:
-    # Python 2.x
-    import urllib2 as http_client_t
-    from urllib2 import HTTPError
-except ImportError:
-    # Python 3.x
-    import urllib.request as http_client_t
-    from urllib.error import HTTPError
+from applicationinsights.channel import SynchronousSender
 
 from azure.cli.telemetry.components.telemetry_client import (CliTelemetryClient, _NoRetrySender, http_client_t)
 

src/azure-cli-testsdk/azure/cli/testsdk/scenario_tests/patches.py

@@ -23,8 +23,7 @@ def _shortcut_long_run_operation(*args, **kwargs):  # pylint: disable=unused-arg
 
 
 def mock_in_unit_test(unit_test, target, replacement):
-    try:
-        import unittest.mock as mock
+    from unittest.mock as mock
     except ImportError:
         import mock
     import unittest

src/azure-cli-testsdk/azure/cli/testsdk/scenario_tests/tests/test_utilities.py

@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 import os
 import unittest
-import mock
+from unittest import mock
 from azure.cli.testsdk.scenario_tests.utilities import (
     create_random_name, get_sha1_hash, is_text_payload, is_json_payload)