From 43cd2bc7afeafcf3aa10bc8bc3fdce9d400ba2ba Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 12 Aug 2020 17:22:56 -0700 Subject: [PATCH] Revert "Add warnings about Python 3.5 deprecation in Certbot (#8154)" This reverts commit 270b5535e24fd3dab4c05fa8929adca8117942f1. --- acme/acme/__init__.py | 8 -------- certbot/certbot/__init__.py | 9 --------- certbot/certbot/_internal/main.py | 4 ---- 3 files changed, 21 deletions(-) diff --git a/acme/acme/__init__.py b/acme/acme/__init__.py index c16f95826..d1679fcad 100644 --- a/acme/acme/__init__.py +++ b/acme/acme/__init__.py @@ -20,11 +20,3 @@ for mod in list(sys.modules): # preserved (acme.jose.* is josepy.*) if mod == 'josepy' or mod.startswith('josepy.'): sys.modules['acme.' + mod.replace('josepy', 'jose', 1)] = sys.modules[mod] - - -if sys.version_info[:2] == (3, 5): - warnings.warn( - "Python 3.5 support will be dropped in the next release of " - "acme. Please upgrade your Python version.", - PendingDeprecationWarning, - ) # pragma: no cover diff --git a/certbot/certbot/__init__.py b/certbot/certbot/__init__.py index e82ab7453..bd5715682 100644 --- a/certbot/certbot/__init__.py +++ b/certbot/certbot/__init__.py @@ -1,13 +1,4 @@ """Certbot client.""" -import warnings -import sys # version number like 1.2.3a0, must have at least 2 parts, like 1.2 __version__ = '1.8.0.dev0' - -if sys.version_info[:2] == (3, 5): - warnings.warn( - "Python 3.5 support will be dropped in the next release of " - "certbot. Please upgrade your Python version.", - PendingDeprecationWarning, - ) # pragma: no cover diff --git a/certbot/certbot/_internal/main.py b/certbot/certbot/_internal/main.py index 6cf2ccf17..30f4dd0a2 100644 --- a/certbot/certbot/_internal/main.py +++ b/certbot/certbot/_internal/main.py @@ -1343,10 +1343,6 @@ def main(cli_args=None): if config.func != plugins_cmd: # pylint: disable=comparison-with-callable raise - if sys.version_info[:2] == (3, 5): - logger.warning("Python 3.5 support will be dropped in the next release " - "of Certbot - please upgrade your Python version.") - set_displayer(config) # Reporter