{Misc.} Remove usages of six

src/azure-cli-core/setup.py

@@ -58,7 +58,6 @@
     'PyJWT>=2.1.0',
     'pyopenssl>=17.1.0',  # https://github.com/pyca/pyopenssl/pull/612
     'requests[socks]~=2.25.1',
-    'six~=1.12',
     'urllib3[secure]>=1.26.5',
 ]
 

src/azure-cli-testsdk/azure/cli/testsdk/base.py

@@ -278,7 +278,7 @@ def get_output_in_json(self):
         return self.json_value
 
     def _in_process_execute(self, cli_ctx, command, expect_failure=False):
-        from six import StringIO
+        from io import StringIO
         from vcr.errors import CannotOverwriteExistingCassetteException
 
         if command.startswith('az '):

src/azure-cli-testsdk/azure/cli/testsdk/utilities.py

@@ -22,7 +22,7 @@ def find_recording_dir(test_file):
 
 @contextmanager
 def force_progress_logging():
-    from six import StringIO
+    from io import StringIO
     import logging
     from knack.log import get_logger
     from .reverse_dependency import get_commands_loggers

src/azure-cli/azure/cli/command_modules/acr/helm.py

@@ -5,7 +5,7 @@
 
 import os
 import platform
-from six.moves.urllib.request import urlopen  # pylint: disable=import-error
+from urllib.request import urlopen
 
 from knack.util import CLIError
 from knack.log import get_logger

src/azure-cli/azure/cli/command_modules/acs/custom.py

@@ -29,8 +29,8 @@
 import zipfile
 from distutils.version import StrictVersion
 from math import isnan
-from six.moves.urllib.request import urlopen  # pylint: disable=import-error
-from six.moves.urllib.error import URLError  # pylint: disable=import-error
+from urllib.request import urlopen
+from urllib.error import URLError
 
 # pylint: disable=import-error
 import yaml

src/azure-cli/azure/cli/command_modules/appservice/custom.py

@@ -21,7 +21,7 @@
 from functools import reduce
 from nacl import encoding, public
 
-from six.moves.urllib.request import urlopen  # pylint: disable=import-error, ungrouped-imports
+from urllib.request import urlopen
 import OpenSSL.crypto
 from fabric import Connection
 

src/azure-cli/azure/cli/command_modules/backup/custom.py

@@ -8,7 +8,7 @@
 import re
 import os
 from datetime import datetime, timedelta, timezone
-from six.moves.urllib.parse import urlparse  # pylint: disable=import-error
+from urllib.parse import urlparse
 # pylint: disable=too-many-lines
 from knack.log import get_logger
 
@@ -1305,7 +1305,7 @@ def _run_client_script_for_windows(client_scripts):
     file_name, password = _get_script_file_name_and_password(windows_script)
 
     # Create File
-    from six.moves.urllib.request import urlopen  # pylint: disable=import-error
+    from urllib.request import urlopen
     import shutil
     with urlopen(windows_script.url) as response, open(file_name, 'wb') as out_file:
         shutil.copyfileobj(response, out_file)

src/azure-cli/azure/cli/command_modules/backup/custom_help.py

@@ -8,7 +8,7 @@
 import re
 import os
 from datetime import datetime, timedelta
-from six.moves.urllib.parse import urlparse  # pylint: disable=import-error
+from urllib.parse import urlparse
 
 from knack.log import get_logger
 

src/azure-cli/azure/cli/command_modules/batch/_command_type.py

@@ -4,7 +4,6 @@
 # --------------------------------------------------------------------------------------------
 
 import re
-from six import string_types
 
 from knack.arguments import CLICommandArgument, IgnoreAction
 from knack.introspection import extract_full_summary_from_signature, extract_args_from_signature
@@ -431,7 +430,7 @@ class AzureBatchDataPlaneCommand:
     # pylint: disable=too-many-instance-attributes, too-few-public-methods, too-many-statements
     def __init__(self, operation, command_loader, client_factory=None, validator=None, **kwargs):
 
-        if not isinstance(operation, string_types):
+        if not isinstance(operation, str):
             raise ValueError("Operation must be a string. Got '{}'".format(operation))
 
         self._flatten = kwargs.pop('flatten', pformat.FLATTEN)  # Number of object levels to flatten

src/azure-cli/azure/cli/command_modules/batch/_exception_handler.py

@@ -25,6 +25,4 @@ def batch_exception_handler(ex):
     elif isinstance(ex, CloudError):
         raise CLIError(ex)
     else:
-        import sys
-        from six import reraise
-        reraise(*sys.exc_info())
+        raise ex

src/azure-cli/azure/cli/command_modules/batch/_format.py

@@ -7,7 +7,7 @@
 
 from collections import OrderedDict
 
-from six.moves.urllib.parse import unquote  # pylint: disable=import-error
+from urllib.parse import unquote
 
 HEAD_PROPERTIES = {  # Convert response headers to properties.
     'Last-Modified': 'lastModified',

src/azure-cli/azure/cli/command_modules/batch/_validators.py

@@ -6,7 +6,7 @@
 import os
 import azure.batch.models
 from azure.cli.core.util import get_file_json
-from six.moves.urllib.parse import urlsplit  # pylint: disable=import-error
+from urllib.parse import urlsplit
 
 
 # TYPES VALIDATORS

src/azure-cli/azure/cli/command_modules/batch/custom.py

@@ -4,8 +4,8 @@
 # --------------------------------------------------------------------------------------------
 
 import base64
-from six.moves.urllib.parse import urlsplit  # pylint: disable=import-error
-from six.moves import configparser
+from urllib.parse import urlsplit
+import configparser
 
 from knack.log import get_logger
 

src/azure-cli/azure/cli/command_modules/batchai/custom.py

@@ -25,7 +25,7 @@
 from msrest.serialization import Deserializer
 from msrestazure.azure_exceptions import CloudError
 from msrestazure.tools import is_valid_resource_id, parse_resource_id
-from six.moves import urllib_parse
+from urllib.parse import urlparse
 
 from azure.cli.core import keys
 from azure.cli.core.util import get_default_admin_username
@@ -185,7 +185,7 @@ def _get_account_name_from_azure_file_url(azure_file_url):
     """
     if not azure_file_url:
         raise CLIError('Azure File URL cannot absent or be empty')
-    o = urllib_parse.urlparse(azure_file_url)
+    o = urlparse(azure_file_url)
     try:
         account, _ = o.netloc.split('.', 1)
         return account

src/azure-cli/azure/cli/command_modules/billing/_exception_handler.py

@@ -11,6 +11,4 @@ def billing_exception_handler(ex):
     if isinstance(ex, ErrorResponse):
         message = ex.error.error.message
         raise CLIError(message)
-    import sys
-    from six import reraise
-    reraise(*sys.exc_info())
+    raise ex

src/azure-cli/azure/cli/command_modules/configure/_utils.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from six.moves import configparser  # pylint: disable=redefined-builtin
+import configparser
 
 
 def get_default_from_config(config, section, option, choice_list, fallback=1):

src/azure-cli/azure/cli/command_modules/consumption/_exception_handler.py

@@ -11,6 +11,4 @@ def consumption_exception_handler(ex):
     if isinstance(ex, ErrorResponseException):
         message = ex.message
         raise CLIError(message)
-    import sys
-    from six import reraise
-    reraise(*sys.exc_info())
+    raise ex

src/azure-cli/azure/cli/command_modules/monitor/custom.py

@@ -107,7 +107,7 @@ def list_metrics(cmd, resource,
     from azure.mgmt.monitor.models import ResultType
     from datetime import datetime
     import dateutil.parser
-    from six.moves.urllib.parse import quote_plus
+    from urllib.parse import quote_plus
 
     if not start_time and not end_time:
         # if neither value provided, end_time is now

src/azure-cli/azure/cli/command_modules/netappfiles/_exception_handler.py

@@ -15,7 +15,4 @@ def netappfiles_exception_handler(ex):
         message = ex
         raise CLIError(message)
 
-    import sys
-
-    from six import reraise
-    reraise(*sys.exc_info())
+    raise ex

src/azure-cli/azure/cli/command_modules/network/_params.py

@@ -6,8 +6,6 @@
 # pylint: disable=line-too-long, too-many-lines
 from argcomplete.completers import FilesCompleter
 
-import six
-
 from knack.arguments import CLIArgumentType, ignore_type
 
 from azure.cli.core.commands.parameters import (get_location_type, get_resource_name_completion_list,
@@ -762,8 +760,7 @@ def load_arguments(self, _):
         c.extra('cmd')
 
     with self.argument_context('network express-route peering') as c:
-        # Using six.integer_types so we get int for Py3 and long for Py2
-        c.argument('peer_asn', help='Autonomous system number of the customer/connectivity provider.', type=six.integer_types[-1])
+        c.argument('peer_asn', help='Autonomous system number of the customer/connectivity provider.', type=int)
         c.argument('vlan_id', help='Identifier used to identify the customer.')
         c.argument('circuit_name', circuit_name_type)
         c.argument('peering_name', name_arg_type, id_part='child_name_1')

src/azure-cli/azure/cli/command_modules/network/zone_file/make_zone_file.py

@@ -47,7 +47,7 @@ def make_zone_file(json_obj):
     }
     """
     import azure.cli.command_modules.network.zone_file.record_processors as record_processors
-    from six import StringIO
+    from io import StringIO
 
     zone_file = StringIO()
 

src/azure-cli/azure/cli/command_modules/policyinsights/_exception_handler.py

@@ -12,7 +12,4 @@ def policy_insights_exception_handler(ex):
     if isinstance(ex, QueryFailure):
         message = '({}) {}'.format(ex.error.error.code, ex.error.error.message)
         raise CLIError(message)
-    import sys
-    from six import reraise
-
-    reraise(*sys.exc_info())
+    raise ex

src/azure-cli/azure/cli/command_modules/rdbms/custom.py

@@ -12,7 +12,7 @@
 from msrestazure.tools import resource_id, is_valid_resource_id, parse_resource_id  # pylint: disable=import-error
 from knack.log import get_logger
 from knack.util import todict
-from six.moves.urllib.request import urlretrieve  # pylint: disable=import-error
+from urllib.request import urlretrieve
 from azure.core.exceptions import ResourceNotFoundError
 from azure.cli.core._profile import Profile
 from azure.cli.core.commands.client_factory import get_subscription_id

src/azure-cli/azure/cli/command_modules/reservations/_exception_handler.py

@@ -11,6 +11,4 @@ def reservations_exception_handler(ex):
     if isinstance(ex, Error):
         message = ex.error.error.message
         raise CLIError(message)
-    import sys
-    from six import reraise
-    reraise(*sys.exc_info())
+    raise ex

src/azure-cli/azure/cli/command_modules/resource/_bicep.py

@@ -17,7 +17,7 @@
 import requests
 import semver
 
-from six.moves.urllib.request import urlopen
+from urllib.request import urlopen
 from knack.log import get_logger
 from azure.cli.core.api import get_config_dir
 from azure.cli.core.azclierror import (

src/azure-cli/azure/cli/command_modules/resource/_exception_handler.py

@@ -12,6 +12,4 @@ def managementgroups_exception_handler(ex):
         if ex.error.error:
             raise CLIError(ex.error.error)
         raise CLIError(ex.error)
-    import sys
-    from six import reraise
-    reraise(*sys.exc_info())
+    raise ex

src/azure-cli/azure/cli/command_modules/resource/custom.py

@@ -17,8 +17,8 @@
 import uuid
 import base64
 
-from six.moves.urllib.request import urlopen  # pylint: disable=import-error
-from six.moves.urllib.parse import urlparse  # pylint: disable=import-error
+from urllib.request import urlopen
+from urllib.parse import urlparse
 
 from msrestazure.tools import is_valid_resource_id, parse_resource_id
 
@@ -936,7 +936,7 @@ def _build_preflight_error_message(preflight_error):
 
 
 def _prepare_template_uri_with_query_string(template_uri, input_query_string):
-    from six.moves.urllib.parse import urlencode, parse_qs, urlsplit, urlunsplit  # pylint: disable=import-error
+    from urllib.parse import urlencode, parse_qs, urlsplit, urlunsplit
 
     try:
         scheme, netloc, path, query_string, fragment = urlsplit(template_uri)  # pylint: disable=unused-variable

src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource_custom.py

@@ -7,8 +7,8 @@
 import tempfile
 import unittest
 
-from six.moves.urllib.request import pathname2url  # pylint: disable=import-error
-from six.moves.urllib.parse import urljoin  # pylint: disable=import-error
+from urllib.request import pathname2url
+from urllib.parse import urljoin
 
 from unittest import mock
 

src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource_validators.py

@@ -6,7 +6,7 @@
 import unittest
 import os.path
 from unittest import mock
-from six import StringIO
+from io import StringIO
 
 from knack.util import CLIError
 from azure.cli.command_modules.resource._validators import (

src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource_custom.py

@@ -7,8 +7,8 @@
 import tempfile
 import unittest
 
-from six.moves.urllib.request import pathname2url  # pylint: disable=import-error
-from six.moves.urllib.parse import urljoin  # pylint: disable=import-error
+from urllib.request import pathname2url
+from urllib.parse import urljoin
 
 from unittest import mock
 

src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource_validators.py

@@ -6,7 +6,7 @@
 import unittest
 import os.path
 from unittest import mock
-from six import StringIO
+from io import StringIO
 
 from knack.util import CLIError
 from azure.cli.command_modules.resource._validators import (

src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py

@@ -7,9 +7,8 @@
 import tempfile
 import unittest
 
-from six.moves.urllib.request import pathname2url  # pylint: disable=import-error
-from six.moves.urllib.parse import urljoin  # pylint: disable=import-error
-from six import assertRaisesRegex
+from urllib.request import pathname2url
+from urllib.parse import urljoin
 
 from unittest import mock
 
@@ -240,7 +239,7 @@ def test_resource_missing_parameters_no_tty(self):
         def prompt_function(x):
             from knack.prompting import NoTTYException
             raise NoTTYException
-        with assertRaisesRegex(self, CLIError, "Missing input parameters: missing"):
+        with self.assertRaisesRegex(CLIError, "Missing input parameters: missing"):
             _get_missing_parameters(parameters, template, prompt_function)
 
     def test_deployment_parameters(self):

src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_validators.py

@@ -6,7 +6,7 @@
 import unittest
 import os.path
 from unittest import mock
-from six import StringIO
+from io import StringIO
 
 from knack.util import CLIError
 from azure.cli.command_modules.resource._validators import (