Add official warnings for the removal of six from vendoring

Author: nateprewitt

botocore/compat.py

@@ -22,11 +22,11 @@
 import shlex
 import re
 import os
+import warnings
 from collections import OrderedDict
 from collections.abc import MutableMapping
 from math import floor
 
-from botocore.vendored import six
 from botocore.exceptions import MD5UnavailableError
 from dateutil.tz import tzlocal
 from urllib3 import exceptions
@@ -360,3 +360,23 @@ def has_minimum_crt_version(minimum_version):
     HAS_GZIP = True
 except ImportError:
     HAS_GZIP = False
+
+
+def __getattr__(name):
+    """
+    Module override to raise warnings when deprecated libraries
+    are imported in external code.
+    """
+    if name == "six":
+        warnstr = (
+            "The botocore.compat.six module is deprecated and will be removed "
+            "in a future version. Please use six as a direct dependency."
+        )
+        warnings.warn(warnstr, DeprecationWarning, stacklevel=2)
+        # The vendored copy of six is deprecated and will be removed in a future version.
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+        from botocore.vendored import six
+        return six
+
+    raise AttributeError(f"module {__name__} has no attribute {name}.")

botocore/vendored/six.py

@@ -27,6 +27,13 @@
 import operator
 import sys
 import types
+import warnings
+
+warnstr = (
+    "The botocore.vendored.six module is deprecated and will be removed "
+    "in a future version. Please use six as a direct dependency."
+)
+warnings.warn(warnstr, DeprecationWarning, stacklevel=2)
 
 __author__ = "Benjamin Peterson <[email protected]>"
 __version__ = "1.16.0"

tests/unit/test_compat.py

@@ -11,6 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import datetime
+import warnings
 
 import pytest
 
@@ -225,3 +226,22 @@ def test_has_crt_global(self):
             assert HAS_CRT
         except ImportError:
             assert not HAS_CRT
+
+
+def test_six_deprecation_warning():
+    msg = "The botocore.compat.six module is deprecated"
+
+    # Verify import from compat raises a warning
+    with warnings.catch_warnings(record=True) as w1:
+       from botocore.compat import six
+    assert any([warning for warning in w1 if msg in str(warning.message)])
+
+    # Verify other imports don't raise a warning
+    with warnings.catch_warnings(record=True) as w2:
+       from botocore.compat import urlparse
+    assert not any([warning for warning in w2 if msg in str(warning.message)])
+
+    # Verify direct import of the module doesn't raise a warning
+    with warnings.catch_warnings(record=True) as w3:
+       import botocore.compat
+    assert not any([warning for warning in w3 if msg in str(warning.message)])

tests/unit/test_vendored.py

@@ -0,0 +1,28 @@
+# Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# 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 warnings
+
+def test_six_deprecation_warning():
+    msg = "The botocore.vendored.six module is deprecated"
+
+    # Verify import from vendored.six raises a warning
+    with warnings.catch_warnings(record=True) as w1:
+       import botocore.vendored.six
+    assert any([warning for warning in w1 if msg in str(warning.message)])
+    
+    # Verify import of other vendored modules don't raise a warning
+    with warnings.catch_warnings(record=True) as w2:
+       import botocore.vendored
+       import botocore.vendored.requests
+    assert not any([warning for warning in w2 if msg in str(warning.message)])