upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

simplify code (#9807)

Browse source
This commit is contained in:
Brad Warren 2023-10-18 14:32:07 -07:00 committed by GitHub
parent 5cf5f36f19
commit 6f7b5ab1cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
certbot-ci/certbot_integration_tests/utils/misc.py
View file

@ -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:

4
certbot-ci/setup.py
View file

@ -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',
]