trim now unneeded usage of botocore.compat shim

botocore/config.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 copy
+from collections import OrderedDict
 
-from botocore.compat import OrderedDict
 from botocore.endpoint import DEFAULT_TIMEOUT, MAX_POOL_CONNECTIONS
 from botocore.exceptions import (
     InvalidMaxRetryAttemptsError,

botocore/credentials.py

@@ -1024,7 +1024,7 @@ def _retrieve_credentials_using(self, credential_process):
             raise CredentialRetrievalError(
                 provider=self.METHOD, error_msg=stderr.decode('utf-8')
             )
-        parsed = botocore.compat.json.loads(stdout.decode('utf-8'))
+        parsed = json.loads(stdout.decode('utf-8'))
         version = parsed.get('Version', '<Version key not provided>')
         if version != 1:
             raise CredentialRetrievalError(

botocore/docs/bcdoc/restdoc.py

@@ -13,8 +13,8 @@
 import logging
 import os
 import re
+from collections import OrderedDict
 
-from botocore.compat import OrderedDict
 from botocore.docs.bcdoc.docstringparser import DocStringParser
 from botocore.docs.bcdoc.style import ReSTStyle
 

botocore/docs/client.py

@@ -11,9 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import os
+from collections import OrderedDict
 
 from botocore import xform_name
-from botocore.compat import OrderedDict
 from botocore.docs.bcdoc.restdoc import DocumentStructure
 from botocore.docs.example import ResponseExampleDocumenter
 from botocore.docs.method import (

botocore/docs/paginator.py

@@ -11,9 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import os
+from collections import OrderedDict
 
 from botocore import xform_name
-from botocore.compat import OrderedDict
 from botocore.docs.bcdoc.restdoc import DocumentStructure
 from botocore.docs.method import document_model_driven_method
 from botocore.docs.utils import DocumentedShape

botocore/docs/waiter.py

@@ -11,9 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import os
+from collections import OrderedDict
 
 from botocore import xform_name
-from botocore.compat import OrderedDict
 from botocore.docs.bcdoc.restdoc import DocumentStructure
 from botocore.docs.method import document_model_driven_method
 from botocore.docs.utils import DocumentedShape

botocore/loaders.py

@@ -102,11 +102,13 @@
 which don't represent the actual service api.
 """
 
+import json
 import logging
 import os
+from collections import OrderedDict
 
 from botocore import BOTOCORE_ROOT
-from botocore.compat import HAS_GZIP, OrderedDict, json
+from botocore.compat import HAS_GZIP
 from botocore.exceptions import DataNotFoundError, UnknownServiceError
 from botocore.utils import deep_merge
 

botocore/model.py

@@ -12,11 +12,10 @@
 # language governing permissions and limitations under the License.
 """Abstractions to interact with service models."""
 
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 from typing import NamedTuple, Union
 
 from botocore.auth import resolve_auth_type
-from botocore.compat import OrderedDict
 from botocore.exceptions import (
     MissingServiceIdError,
     UndefinedModelAttributeError,

botocore/signers.py

@@ -14,11 +14,11 @@
 import datetime
 import json
 import weakref
+from collections import OrderedDict
 
 import botocore
 import botocore.auth
 from botocore.awsrequest import create_request_object, prepare_request_dict
-from botocore.compat import OrderedDict
 from botocore.exceptions import (
     ParamValidationError,
     UnknownClientMethodError,

tests/__init__.py

@@ -27,14 +27,15 @@
 from io import BytesIO
 from subprocess import PIPE, Popen
 from unittest import mock
+from urllib.parse import parse_qs, urlparse
 
 from dateutil.tz import tzlocal
 
 import botocore.loaders
 import botocore.session
 from botocore import credentials, utils
 from botocore.awsrequest import AWSResponse
-from botocore.compat import HAS_CRT, parse_qs, urlparse
+from botocore.compat import HAS_CRT
 from botocore.configprovider import create_botocore_default_config_mapping
 from botocore.httpchecksum import _CHECKSUM_CLS, DEFAULT_CHECKSUM_ALGORITHM
 from botocore.stub import Stubber

tests/functional/test_discovery.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.config import Config
 from botocore.discovery import EndpointDiscoveryRequired
 from botocore.exceptions import (

tests/functional/test_dynamodb.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.config import Config
 from tests import BaseSessionTest, ClientHTTPStubber
 

tests/integration/test_s3.py

@@ -16,7 +16,7 @@
 import tempfile
 import threading
 import time
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 from contextlib import closing
 from io import BytesIO
 from tarfile import TarFile
@@ -27,7 +27,7 @@
 import botocore.auth
 import botocore.credentials
 import botocore.session
-from botocore.compat import OrderedDict, zip_longest
+from botocore.compat import zip_longest
 from botocore.config import Config
 from botocore.exceptions import ClientError, ConnectionClosedError, WaiterError
 from tests import (

tests/unit/auth/test_signers.py

@@ -17,11 +17,12 @@
 import io
 import json
 import time
+from urllib.parse import parse_qs, urlsplit
 
 import botocore.auth
 import botocore.credentials
 from botocore.awsrequest import AWSRequest
-from botocore.compat import HTTPHeaders, parse_qs, urlsplit
+from botocore.compat import HTTPHeaders
 from tests import mock, unittest
 
 

tests/unit/auth/test_sigv4.py

@@ -29,12 +29,12 @@
 import os
 import re
 from http.server import BaseHTTPRequestHandler
+from urllib.parse import parse_qsl, urlsplit
 
 import pytest
 
 import botocore.auth
 from botocore.awsrequest import AWSRequest
-from botocore.compat import parse_qsl, urlsplit
 from botocore.credentials import Credentials
 from tests import FreezeTime
 

tests/unit/docs/__init__.py

@@ -14,9 +14,9 @@
 import os
 import shutil
 import tempfile
+from collections import OrderedDict
 
 from botocore.client import ClientCreator
-from botocore.compat import OrderedDict
 from botocore.configprovider import ConfigValueStore
 from botocore.docs.bcdoc.restdoc import DocumentStructure
 from botocore.hooks import HierarchicalEmitter

tests/unit/docs/test_sharedexample.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 OrderedDict
+from collections import OrderedDict
+
 from botocore.docs.sharedexample import (
     SharedExampleDocumenter,
     document_shared_examples,

tests/unit/test_credentials.py

@@ -11,6 +11,7 @@
 # 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 os
 import shutil
 import subprocess
@@ -25,7 +26,6 @@
 import botocore.exceptions
 import botocore.session
 from botocore import credentials
-from botocore.compat import json
 from botocore.configprovider import ConfigValueStore
 from botocore.credentials import (
     AssumeRoleProvider,

tests/unit/test_handlers.py

@@ -17,14 +17,15 @@
 import json
 import logging
 import os
+from collections import OrderedDict
+from urllib.parse import quote
 
 import pytest
 
 import botocore
 import botocore.session
 from botocore import handlers
 from botocore.awsrequest import AWSRequest
-from botocore.compat import OrderedDict, quote
 from botocore.config import Config
 from botocore.credentials import Credentials
 from botocore.docs.bcdoc.restdoc import DocumentStructure

tests/unit/test_model.py

@@ -1,7 +1,8 @@
+from collections import OrderedDict
+
 import pytest
 
 from botocore import model
-from botocore.compat import OrderedDict
 from tests import unittest
 
 

tests/unit/test_parsers.py

@@ -12,12 +12,13 @@
 # language governing permissions and limitations under the License.
 import datetime
 import itertools
+import json
 
 import pytest
 from dateutil.tz import tzutc
 
 from botocore import model, parsers
-from botocore.compat import MutableMapping, json
+from botocore.compat import MutableMapping
 from tests import RawResponse, unittest
 
 

tests/unit/test_protocols.py

@@ -52,16 +52,18 @@
 """
 
 import copy
+import json
 import os
 from base64 import b64decode
 from calendar import timegm
+from collections import OrderedDict
 from enum import Enum
+from urllib.parse import urlsplit
 
 import pytest
 from dateutil.tz import tzutc
 
 from botocore.awsrequest import HeadersDict, prepare_request_dict
-from botocore.compat import OrderedDict, json, urlsplit
 from botocore.eventstream import EventStream
 from botocore.model import NoShapeFoundError, OperationModel, ServiceModel
 from botocore.parsers import (

tests/unit/test_s3_addressing.py

@@ -14,8 +14,8 @@
 # language governing permissions and limitations under the License.
 
 import os
+from collections import OrderedDict
 
-from botocore.compat import OrderedDict
 from botocore.handlers import set_list_objects_encoding_type_url
 from tests import BaseSessionTest, ClientHTTPStubber
 

tests/unit/test_utils.py

@@ -13,6 +13,7 @@
 import copy
 import datetime
 import io
+import json
 import operator
 from contextlib import contextmanager
 from sys import getrefcount
@@ -23,7 +24,6 @@
 import botocore
 from botocore import xform_name
 from botocore.awsrequest import AWSRequest, HeadersDict
-from botocore.compat import json
 from botocore.config import Config
 from botocore.endpoint_provider import RuleSetEndpoint
 from botocore.exceptions import (