From 6f7b5ab1cd900b9d2e7970902e832cf2e5f41d97 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 18 Oct 2023 14:32:07 -0700 Subject: [PATCH] simplify code (#9807) --- certbot-ci/certbot_integration_tests/utils/misc.py | 11 ++--------- certbot-ci/setup.py | 4 +++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/certbot-ci/certbot_integration_tests/utils/misc.py b/certbot-ci/certbot_integration_tests/utils/misc.py index dfeda4cda..8ef59fe1b 100644 --- a/certbot-ci/certbot_integration_tests/utils/misc.py +++ b/certbot-ci/certbot_integration_tests/utils/misc.py @@ -47,15 +47,8 @@ ECDSA_KEY_TYPE = 'ecdsa' def _suppress_x509_verification_warnings() -> None: - try: - import urllib3 - urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) - except ImportError: - # Handle old versions of request with vendorized urllib3 - # pylint: disable=no-member,line-too-long - from requests.packages.urllib3.exceptions import InsecureRequestWarning # type: ignore[import-untyped] - requests.packages.urllib3.disable_warnings(InsecureRequestWarning) # type: ignore[attr-defined] - # pylint: enable=no-member,line-too-long + import urllib3 + urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) def check_until_timeout(url: str, attempts: int = 30) -> None: diff --git a/certbot-ci/setup.py b/certbot-ci/setup.py index 81feeb7cf..4fd64e258 100644 --- a/certbot-ci/setup.py +++ b/certbot-ci/setup.py @@ -19,7 +19,9 @@ install_requires = [ 'pywin32>=300 ; sys_platform == "win32"', 'pyyaml', 'pytz>=2019.3', - 'requests', + # requests unvendored its dependencies in version 2.16.0 and this code relies on that for + # calling `urllib3.disable_warnings`. + 'requests>=2.16.0', 'setuptools', 'types-python-dateutil', ]