diff --git a/DESCRIPTION.md b/DESCRIPTION.md index 86b48ac63..ada442772 100644 --- a/DESCRIPTION.md +++ b/DESCRIPTION.md @@ -13,6 +13,7 @@ Source code is also available at: https://github.com/snowflakedb/snowflake-conne - Fixed a bug where url port and path were ignore in private link oscp retry. - Added thread safety in telemetry when instantiating multiple connections concurrently. - Bumped platformdirs dependency from >=2.6.0,<3.9.0 to >=2.6.0,<4.0.0.0 and made necessary changes to allow this. + - Removed the deprecation warning from the vendored urllib3 about urllib3.contrib.pyopenssl deprecation. - v3.2.0(September 06,2023) diff --git a/src/snowflake/connector/vendored/urllib3/__init__.py b/src/snowflake/connector/vendored/urllib3/__init__.py index c6fa38212..fe86b59d7 100644 --- a/src/snowflake/connector/vendored/urllib3/__init__.py +++ b/src/snowflake/connector/vendored/urllib3/__init__.py @@ -19,23 +19,6 @@ from .util.timeout import Timeout from .util.url import get_host -# === NOTE TO REPACKAGERS AND VENDORS === -# Please delete this block, this logic is only -# for urllib3 being distributed via PyPI. -# See: https://github.com/urllib3/urllib3/issues/2680 -try: - import urllib3_secure_extra # type: ignore # noqa: F401 -except ImportError: - pass -else: - warnings.warn( - "'urllib3[secure]' extra is deprecated and will be removed " - "in a future release of urllib3 2.x. Read more in this issue: " - "https://github.com/urllib3/urllib3/issues/2680", - category=DeprecationWarning, - stacklevel=2, - ) - __author__ = "Andrey Petrov (andrey.petrov@shazow.net)" __license__ = "MIT" __version__ = __version__ diff --git a/src/snowflake/connector/vendored/urllib3/contrib/pyopenssl.py b/src/snowflake/connector/vendored/urllib3/contrib/pyopenssl.py index 1ed214b1d..9c3a3436a 100644 --- a/src/snowflake/connector/vendored/urllib3/contrib/pyopenssl.py +++ b/src/snowflake/connector/vendored/urllib3/contrib/pyopenssl.py @@ -73,20 +73,11 @@ class UnsupportedExtension(Exception): import logging import ssl import sys -import warnings from .. import util from ..packages import six from ..util.ssl_ import PROTOCOL_TLS_CLIENT -warnings.warn( - "'urllib3.contrib.pyopenssl' module is deprecated and will be removed " - "in a future release of urllib3 2.x. Read more in this issue: " - "https://github.com/urllib3/urllib3/issues/2680", - category=DeprecationWarning, - stacklevel=2, -) - __all__ = ["inject_into_urllib3", "extract_from_urllib3"] # SNI always works.