remove the very last reference to "six"

awscli/argprocess.py

@@ -12,10 +12,11 @@
 # language governing permissions and limitations under the License.
 """Module for processing CLI args."""
 
+import json
 import logging
 import os
+from collections import OrderedDict
 
-from botocore.compat import OrderedDict, json
 from botocore.utils import is_json_value_header
 
 from awscli import COMPLEX_TYPES, SCALAR_TYPES, shorthand

awscli/bcdoc/restdoc.py

@@ -11,8 +11,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import logging
+from collections import OrderedDict
 
-from botocore.compat import OrderedDict
 from awscli.bcdoc.docstringparser import DocStringParser
 from awscli.bcdoc.style import ReSTStyle
 

awscli/clidriver.py

@@ -13,9 +13,10 @@
 import logging
 import signal
 import sys
+from collections import OrderedDict
 
 import botocore.session
-from botocore.compat import OrderedDict, copy_kwargs
+from botocore.compat import copy_kwargs
 from botocore.exceptions import (
     NoCredentialsError,
     NoRegionError,

awscli/compat.py

@@ -22,12 +22,11 @@
 import shlex
 import signal
 import urllib.parse as urlparse
+from collections import OrderedDict
 from configparser import RawConfigParser
 from urllib.error import URLError
 from urllib.request import urlopen
 
-from botocore.compat import six, OrderedDict
-
 import sys
 import zipfile
 from functools import partial

awscli/customizations/cloudformation/yamlhelper.py

@@ -10,8 +10,8 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-from botocore.compat import json
-from botocore.compat import OrderedDict
+import json
+from collections import OrderedDict
 
 import yaml
 from yaml.resolver import ScalarNode, SequenceNode

awscli/customizations/cloudsearch.py

@@ -12,9 +12,9 @@
 # language governing permissions and limitations under the License.
 
 import logging
+from collections import OrderedDict
 
 from awscli.customizations.flatten import FlattenArguments, SEP
-from botocore.compat import OrderedDict
 
 LOG = logging.getLogger(__name__)
 

awscli/customizations/commands.py

@@ -1,8 +1,8 @@
 import logging
 import os
+from collections import OrderedDict
 
 from botocore import model
-from botocore.compat import OrderedDict
 from botocore.validate import validate_parameters
 
 import awscli

awscli/customizations/eks/kubeconfig.py

@@ -15,7 +15,7 @@
 import yaml
 import logging
 import errno
-from botocore.compat import OrderedDict
+from collections import OrderedDict
 
 from awscli.customizations.eks.exceptions import EKSError
 from awscli.customizations.eks.ordered_yaml import (ordered_yaml_load,

awscli/customizations/eks/ordered_yaml.py

@@ -11,8 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+from collections import OrderedDict
+
 import yaml
-from botocore.compat import OrderedDict
 
 
 class SafeOrderedLoader(yaml.SafeLoader):

awscli/customizations/eks/update_kubeconfig.py

@@ -13,8 +13,7 @@
 
 import os
 import logging
-
-from botocore.compat import OrderedDict
+from collections import OrderedDict
 
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.utils import uni_print

awscli/customizations/emr/createcluster.py

@@ -11,7 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+import json
 import re
+
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.emr import applicationutils
 from awscli.customizations.emr import argumentschema
@@ -27,7 +29,6 @@
 from awscli.customizations.emr.command import Command
 from awscli.customizations.emr.constants import EC2_ROLE_NAME
 from awscli.customizations.emr.constants import EMR_ROLE_NAME
-from botocore.compat import json
 
 
 class CreateCluster(Command):

awscli/customizations/emr/emrfsutils.py

@@ -11,10 +11,11 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+from collections import OrderedDict
+
 from awscli.customizations.emr import constants
 from awscli.customizations.emr import emrutils
 from awscli.customizations.emr import exceptions
-from botocore.compat import OrderedDict
 
 
 CONSISTENT_OPTIONAL_KEYS = ['RetryCount', 'RetryPeriod']

awscli/customizations/servicecatalog/generateproduct.py

@@ -11,12 +11,12 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+import json
 import sys
 
 from awscli.customizations.servicecatalog import helptext
 from awscli.customizations.servicecatalog.generatebase \
     import GenerateBaseCommand
-from botocore.compat import json
 
 
 class GenerateProductCommand(GenerateBaseCommand):

awscli/customizations/servicecatalog/generateprovisioningartifact.py

@@ -11,12 +11,12 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+import json
 import sys
 
 from awscli.customizations.servicecatalog import helptext
 from awscli.customizations.servicecatalog.generatebase \
     import GenerateBaseCommand
-from botocore.compat import json
 
 
 class GenerateProvisioningArtifactCommand(GenerateBaseCommand):

awscli/formatter.py

@@ -10,9 +10,9 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+import json
 import logging
 
-from botocore.compat import json
 from botocore.paginate import PageIterator
 from botocore.utils import set_value_from_jmespath
 

tests/functional/eks/test_kubeconfig.py

@@ -13,8 +13,7 @@
 import os
 import shutil
 import tempfile
-
-from botocore.compat import OrderedDict
+from collections import OrderedDict
 
 from awscli.testutils import mock, unittest
 from tests.functional.eks.test_util import get_testdata

tests/unit/customizations/cloudformation/test_yamlhelper.py

@@ -10,10 +10,9 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+import json
 import tempfile
-
-from botocore.compat import json
-from botocore.compat import OrderedDict
+from collections import OrderedDict
 
 from awscli.testutils import mock, unittest
 from awscli.customizations.cloudformation.deployer import Deployer

tests/unit/customizations/datapipeline/test_create_default_role.py

@@ -1,3 +1,5 @@
+import json
+
 import pytest
 
 import awscli.customizations.datapipeline.createdefaultroles \
@@ -11,7 +13,6 @@
 from awscli.testutils import BaseAWSCommandParamsTest,\
     mock, unittest
 from awscli.customizations.datapipeline.translator import dict_to_string
-from botocore.compat import json
 
 
 @pytest.mark.filterwarnings('ignore::UserWarning')

tests/unit/customizations/datapipeline/test_translator.py

@@ -10,12 +10,13 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+import json
+from collections import OrderedDict
+
 from awscli.customizations.datapipeline.translator \
     import PipelineDefinitionError
 from awscli.testutils import unittest
 
-from botocore.compat import OrderedDict, json
-
 from awscli.customizations.datapipeline import translator
 
 

tests/unit/customizations/dlm/test_create_default_role.py

@@ -10,8 +10,9 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+import json
+
 from awscli.testutils import BaseAWSCommandParamsTest, mock, unittest
-from botocore.compat import json
 import botocore.session
 from awscli.customizations.dlm.iam import IAM
 

tests/unit/customizations/eks/test_kubeconfig.py

@@ -15,7 +15,7 @@
 import os
 import tempfile
 import shutil
-from botocore.compat import OrderedDict
+from collections import OrderedDict
 
 from awscli.testutils import mock, unittest, skip_if_windows
 from awscli.customizations.utils import uni_print

tests/unit/customizations/eks/test_update_kubeconfig.py

@@ -17,9 +17,9 @@
 import sys
 import tempfile
 from argparse import Namespace
+from collections import OrderedDict
 
 import botocore
-from botocore.compat import OrderedDict
 
 import awscli.customizations.eks.kubeconfig as kubeconfig
 from awscli.customizations.eks.exceptions import EKSClusterError, EKSError

tests/unit/customizations/emr/test_create_cluster_release_label.py

@@ -12,10 +12,9 @@
 # language governing permissions and limitations under the License.
 
 import copy
+import json
 import os
-
-from botocore.compat import json
-from botocore.compat import OrderedDict
+from collections import OrderedDict
 
 from tests.unit.customizations.emr import test_constants as \
     CONSTANTS

tests/unit/customizations/emr/test_create_default_role.py

@@ -10,7 +10,8 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-from botocore.compat import json
+import json
+
 from botocore.awsrequest import AWSResponse
 from botocore.exceptions import ClientError
 

tests/unit/customizations/servicecatalog/test_generateproduct.py

@@ -11,13 +11,13 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+import json
 from argparse import Namespace
 
 from awscli.customizations.servicecatalog import exceptions
 from awscli.customizations.servicecatalog.generateproduct \
     import GenerateProductCommand
 from awscli.testutils import unittest, mock, capture_output
-from botocore.compat import json
 
 
 class TestCreateProductCommand(unittest.TestCase):

tests/unit/customizations/servicecatalog/test_generateprovisioningartifact.py

@@ -11,13 +11,13 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+import json
 from argparse import Namespace
 
 from awscli.customizations.servicecatalog import exceptions
 from awscli.customizations.servicecatalog.generateprovisioningartifact \
     import GenerateProvisioningArtifactCommand
 from awscli.testutils import unittest, mock, capture_output
-from botocore.compat import json
 
 
 class TestCreateProvisioningArtifactCommand(unittest.TestCase):

tests/unit/output/test_json_output.py

@@ -11,10 +11,10 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-from botocore.compat import json
+import json
 import platform
-from awscli.formatter import JSONFormatter
 
+from awscli.formatter import JSONFormatter
 from awscli.testutils import BaseAWSCommandParamsTest, unittest
 from awscli.testutils import mock, skip_if_windows
 from awscli.compat import StringIO, get_stdout_text_writer

tests/unit/test_argprocess.py

@@ -11,10 +11,10 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import json
+from collections import OrderedDict
 
 from botocore import xform_name
 from botocore import model
-from botocore.compat import OrderedDict
 
 from awscli.testutils import mock
 from awscli.testutils import unittest

tests/unit/test_clidriver.py

@@ -18,10 +18,10 @@
 import io
 import sys
 import importlib
+from collections import OrderedDict
 
 from botocore.awsrequest import AWSResponse
 from botocore.exceptions import NoCredentialsError
-from botocore.compat import OrderedDict
 import botocore.model
 
 import awscli

tests/unit/test_completer.py

@@ -12,8 +12,8 @@
 # language governing permissions and limitations under the License.
 import pprint
 import difflib
+from collections import OrderedDict
 
-from botocore.compat import OrderedDict
 from botocore.model import OperationModel
 from awscli.clidriver import (
     CLIDriver, ServiceCommand, ServiceOperation, CLICommand)

tests/unit/test_schema.py

@@ -11,8 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import pprint
-
-from botocore.compat import OrderedDict
+from collections import OrderedDict
 
 from awscli.testutils import unittest
 from awscli.schema import ParameterRequiredError, SchemaTransformer