diff --git a/setup.py b/setup.py index 7a09b4f196..3ce6ae2994 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,6 @@ from __future__ import absolute_import, division, print_function, unicode_literals import sys -import time try: from setuptools import setup, __version__ as setuptools_version @@ -42,12 +41,9 @@ raise ImportError('Sopel requires Python 2.7+ or 3.3+.') # Py2 EOL: https://www.python.org/dev/peps/pep-0373/#maintenance-releases if sys.version_info.major == 2: - now = time.time() - state = "has reached end of life" - if now >= 1588291200: # 2020-05-01 00:00:00 UTC - state += " and will receive no further updates" print( - "Warning: Python 2 %s. Sopel 8.0 will drop support for it." % state, + 'Warning: Python 2.x has reached end of life and will receive ' + 'no further updates. Sopel 8.0 will drop support for it.', file=sys.stderr, ) diff --git a/sopel/cli/run.py b/sopel/cli/run.py index 680990892c..3c47251711 100755 --- a/sopel/cli/run.py +++ b/sopel/cli/run.py @@ -30,11 +30,9 @@ tools.stderr('Error: Sopel requires Python 2.7+ or 3.3+.') sys.exit(1) if sys.version_info.major == 2: - now = time.time() - state = 'has reached end of life' - if now >= 1588291200: # 2020-05-01 00:00:00 UTC - state += ' and will receive no further updates' - tools.stderr('Warning: Python 2.x %s. Sopel 8.0 will drop support for it.' % state) + tools.stderr( + 'Warning: Python 2.x has reached end of life and will receive ' + 'no further updates. Sopel 8.0 will drop support for it.') LOGGER = logging.getLogger(__name__)