Move MutableMapping import into compat.py

jamesls · jamesls · commit ebd12d8d539b · 2019-12-20T13:14:06.000-08:00
diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
@@ -25,14 +25,9 @@
 import botocore.utils
 from botocore.compat import six
 from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit, \
-     urlencode
+     urlencode, MutableMapping
 from botocore.exceptions import UnseekableStreamError
 
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
-
 
 logger = logging.getLogger(__name__)
 
diff --git a/botocore/compat.py b/botocore/compat.py
@@ -377,3 +377,9 @@ def _windows_shell_split(s):
         components.append(''.join(buff))
 
     return components
+
+
+try:
+    from collections.abc import MutableMapping
+except ImportError:
+    from collections import MutableMapping
diff --git a/botocore/session.py b/botocore/session.py
@@ -48,11 +48,7 @@
 from botocore import retryhandler, translate
 from botocore import utils
 from botocore.utils import EVENT_ALIASES
-
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
+from botocore.compat import MutableMapping
 
 
 logger = logging.getLogger(__name__)
diff --git a/tests/unit/test_parsers.py b/tests/unit/test_parsers.py
@@ -18,12 +18,7 @@
 
 from botocore import parsers
 from botocore import model
-from botocore.compat import json
-
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
+from botocore.compat import json, MutableMapping
 
 
 # HTTP responses will typically return a custom HTTP
