From 5b46327840768ba1600cc55d524b81020e77f90d Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 25 Nov 2024 11:03:45 -0800
Subject: [PATCH] remove py38 warnings

---
 acme/acme/__init__.py             | 8 --------
 certbot/certbot/__init__.py       | 9 ---------
 certbot/certbot/_internal/main.py | 4 ----
 pytest.ini                        | 2 --
 4 files changed, 23 deletions(-)

diff --git a/acme/acme/__init__.py b/acme/acme/__init__.py
index 51034a301..1e21b5896 100644
--- a/acme/acme/__init__.py
+++ b/acme/acme/__init__.py
@@ -6,7 +6,6 @@ This module is an implementation of the `ACME protocol`_.
 
 """
 import sys
-import warnings
 
 # This code exists to keep backwards compatibility with people using acme.jose
 # before it became the standalone josepy package.
@@ -20,10 +19,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, 8):
-    warnings.warn(
-            "Python 3.8 support will be dropped in the next planned 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 01e12b3a6..5d408af20 100644
--- a/certbot/certbot/__init__.py
+++ b/certbot/certbot/__init__.py
@@ -1,13 +1,4 @@
 """Certbot client."""
-import sys
-import warnings
 
 # version number like 1.2.3a0, must have at least 2 parts, like 1.2
 __version__ = '3.1.0.dev0'
-
-if sys.version_info[:2] == (3, 8):
-    warnings.warn(
-            "Python 3.8 support will be dropped in the next planned 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 107443b5f..2fa80e364 100644
--- a/certbot/certbot/_internal/main.py
+++ b/certbot/certbot/_internal/main.py
@@ -1866,10 +1866,6 @@ def main(cli_args: Optional[List[str]] = None) -> Optional[Union[str, int]]:
         if config.func != plugins_cmd:  # pylint: disable=comparison-with-callable
             raise
 
-    if sys.version_info[:2] == (3, 8):
-        logger.warning("Python 3.8 support will be dropped in the next planned release "
-                       "of Certbot - please upgrade your Python version.")
-
     with make_displayer(config) as displayer:
         display_obj.set_display(displayer)
 
diff --git a/pytest.ini b/pytest.ini
index 55c8435fd..65932b071 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -25,7 +25,6 @@
 #    dependencies) until https://github.com/certbot/certbot/issues/9828 is resolved.
 # 6) Similarly to 6), CSR support is deprecated in pyOpenSSL since 24.2, we silence
 #    the warning until https://github.com/certbot/certbot/issues/9992 is resolved.
-# 7) Ignore our own PendingDeprecationWarning about Python 3.8 soon to be dropped.
 filterwarnings =
     error
     ignore:decodestring\(\) is a deprecated alias:DeprecationWarning:dns
@@ -34,4 +33,3 @@ filterwarnings =
     ignore:.*datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:dateutil
     ignore:X509Extension support in pyOpenSSL is deprecated:DeprecationWarning
     ignore:CSR support in pyOpenSSL is deprecated:DeprecationWarning
-    ignore:Python 3.8 support will be dropped:PendingDeprecationWarning