Time, Geography: remove pytz and other Python < 3.9 support

Author: jlu5

plugins/Geography/plugin.py

@@ -49,15 +49,6 @@ def timezone_from_uri(irc, uri):
             format(_("Could not understand timezone: %s"), e.args[0]),
             Raise=True,
         )
-    except utils.time.MissingTimezoneLibrary:
-        irc.error(
-            _(
-                "Timezone-related commands are not available. "
-                "Your administrator need to either upgrade Python to "
-                "version 3.9 or greater, or install pytz."
-            ),
-            Raise=True,
-        )
     except utils.time.TimezoneException as e:
         irc.error(e.args[0], Raise=True)
 
@@ -160,10 +151,6 @@ def timezone(self, irc, msg, args, query):
                 # instance of zoneinfo.ZoneInfo
                 irc.reply(format("%s (currently %s)", timezone.key, offset))
                 return
-            elif hasattr(timezone, "zone"):
-                # instance of pytz.timezone
-                irc.reply(format("%s (currently %s)", timezone.zone, offset))
-                return
             else:
                 # probably datetime.timezone built from a constant offset
                 try:

plugins/Geography/test.py

@@ -30,15 +30,9 @@
 
 import datetime
 import functools
-import contextlib
 from unittest import skipIf
 from unittest.mock import patch
 
-try:
-    import pytz
-except ImportError:
-    pytz = None
-
 try:
     import zoneinfo
 except ImportError:
@@ -64,35 +58,6 @@ def newf(self):
 class GeographyTimezoneTestCase(PluginTestCase):
     plugins = ("Geography",)
 
-    @skipIf(not pytz, "pytz is not available")
-    @mock
-    def testTimezonePytz(self):
-        tz = pytz.timezone("Europe/Paris")
-        with patch.object(wikidata, "timezone_from_uri", return_value=tz):
-            self.assertRegexp(
-                "timezone Foo Bar", r"Europe/Paris \(currently UTC\+[12]\)"
-            )
-
-        tz = pytz.timezone("America/New_York")
-        with patch.object(wikidata, "timezone_from_uri", return_value=tz):
-            self.assertRegexp(
-                "timezone New York", r"America/New_York \(currently UTC-[45]\)"
-            )
-
-        tz = pytz.timezone("America/St_Johns")
-        with patch.object(wikidata, "timezone_from_uri", return_value=tz):
-            self.assertRegexp(
-                "timezone Newfoundland",
-                r"America/St_Johns \(currently UTC-[23]:30\)",
-            )
-
-        tz = pytz.timezone("Asia/Kolkata")
-        with patch.object(wikidata, "timezone_from_uri", return_value=tz):
-            self.assertRegexp(
-                "timezone Delhi", r"Asia/Kolkata \(currently UTC\+5:30\)"
-            )
-
-    @skipIf(not zoneinfo, "Python is older than 3.9")
     @mock
     def testTimezoneZoneinfo(self):
         tz = zoneinfo.ZoneInfo("Europe/Paris")
@@ -120,7 +85,6 @@ def testTimezoneZoneinfo(self):
                 "timezone Delhi", r"Asia/Kolkata \(currently UTC\+5:30\)"
             )
 
-    @skipIf(not zoneinfo, "Python is older than 3.9")
     @mock
     def testTimezoneAbsolute(self):
         tz = datetime.timezone(datetime.timedelta(hours=4))
@@ -150,23 +114,13 @@ def testTimezoneIntegration(self):
 class GeographyLocaltimeTestCase(PluginTestCase):
     plugins = ("Geography",)
 
-    @skipIf(not pytz, "pytz is not available")
-    @mock
-    def testLocaltimePytz(self):
-        tz = pytz.timezone("Europe/Paris")
-
-        with patch.object(wikidata, "timezone_from_uri", return_value=tz):
-            self.assertRegexp("localtime Foo Bar", r".*\+0[12]00$")
-
-    @skipIf(not zoneinfo, "Python is older than 3.9")
     @mock
     def testLocaltimeZoneinfo(self):
         tz = zoneinfo.ZoneInfo("Europe/Paris")
 
         with patch.object(wikidata, "timezone_from_uri", return_value=tz):
             self.assertRegexp("localtime Foo Bar", r".*\+0[12]00$")
 
-    @skipIf(not zoneinfo, "Python is older than 3.9")
     @mock
     def testLocaltimeAbsolute(self):
         tz = datetime.timezone(datetime.timedelta(hours=4))

plugins/Time/plugin.py

@@ -222,12 +222,6 @@ def tztime(self, irc, msg, args, tz):
                 tz = utils.time.iana_timezone(tz)
             except utils.time.UnknownTimeZone:
                 irc.error(_('Unknown timezone'), Raise=True)
-            except utils.time.MissingTimezoneLibrary:
-                irc.error(_(
-                    'Timezone-related commands are not available. '
-                    'Your administrator need to either upgrade Python to '
-                    'version 3.9 or greater, or install pytz.'),
-                    Raise=True)
             except utils.time.TimezoneException as e:
                 irc.error(e.args[0], Raise=True)
 

plugins/Time/test.py

@@ -31,16 +31,6 @@
 import sys
 from supybot.test import *
 
-if sys.version_info >= (3, 9):
-    has_tz_lib = True
-else:
-    try:
-        import pytz
-    except ImportError:
-        has_tz_lib = False
-    else:
-        has_tz_lib = True
-
 try:
     import dateutil
 except ImportError:
@@ -55,20 +45,7 @@
 else:
     has_ddate = True
 
-try:
-    from unittest import skipIf
-except ImportError: # Python 2.6
-    def skipIf(cond, reason):
-        if cond:
-            print('Skipped: %s' % reason)
-            def decorator(f):
-                return None
-        else:
-            def decorator(f):
-                return f
-        return decorator
-
-
+from unittest import skipIf
 
 class TimeTestCase(PluginTestCase):
     plugins = ('Time','Utilities')
@@ -88,9 +65,6 @@ def testSeconds(self):
         self.assertResponse('seconds 1y 1s', '31536001')
         self.assertResponse('seconds 1w 1s', '604801')
 
-    @skipIf(sys.version_info < (3, 7, 0),
-            "Python 3.6 does not support empty pattern matches, see: "
-            "https://docs.python.org/3/library/re.html#re.split")
     def testSecondsNoSpace(self):
         self.assertResponse('seconds 1m1s', '61')
         self.assertResponse('seconds 1h1s', '3601')
@@ -103,7 +77,6 @@ def testNoErrors(self):
         self.assertNotError('ctime')
         self.assertNotError('time %Y')
 
-    @skipIf(not has_tz_lib, 'python version is older than 3.9 and pytz is missing')
     def testTztime(self):
         self.assertNotError('tztime Europe/Paris')
         self.assertNotError('tztime America/Indiana/Knox')

requirements.txt

@@ -13,6 +13,5 @@ pyxmpp2-scram               # for the scram-sha-256 SASL mechanism
 
 cryptography                # required to load the Fediverse plugin (used to implement HTTP signatures to support Mastodon instances with AUTHORIZED_FETCH=true)
 feedparser                  # required to load the RSS plugin
-pytz;python_version<'3.9'   # enables timezone manipulation in the Time and Geography plugins. On Python >=3.9, the standard library is used instead
 python-dateutil             # enable fancy time string parsing in the Time plugin
 ddate                       # required for the ddate command in the Time plugin

src/utils/time.py

@@ -29,53 +29,28 @@
 ###
 
 import re
-import sys
-
-if sys.version_info >= (3, 9):
-    import zoneinfo
-else:
-    zoneinfo = None
-
-try:
-    import pytz
-except ImportError:
-    pytz = None
+import zoneinfo
 
 _IANA_TZ_RE = re.compile(r"([\w_-]+/)*[\w_-]+")
 
 class TimezoneException(Exception):
     pass
 
-class MissingTimezoneLibrary(TimezoneException):
-    pass
-
 class UnknownTimeZone(TimezoneException):
     pass
 
 def iana_timezone(name):
     """Returns a :class:datetime.tzinfo object, given an IANA timezone name,
     eg. ``"Europe/Paris"``.
 
-    This uses :class:``zoneinfo.ZoneInfo`` if available,
-    :func:``pytz.timezone`` otherwise.
+    This uses :class:``zoneinfo.ZoneInfo`.
 
     May raise instances of :exc:`TimezoneException`.
     """
     if not _IANA_TZ_RE.match(name):
         raise UnknownTimeZone(name)
 
-    if zoneinfo:
-        try:
-            return zoneinfo.ZoneInfo(name)
-        except zoneinfo.ZoneInfoNotFoundError as e:
-            raise UnknownTimeZone(e.args[0]) from None
-    elif pytz:
-        try:
-            return pytz.timezone(name)
-        except pytz.UnknownTimeZoneError as e:
-            raise UnknownTimeZone(e.args[0]) from None
-    else:
-        raise MissingTimezoneLibrary(
-            "Could not find a timezone library. "
-            "Update Python to version 3.9 or newer, or install pytz."
-        )
+    try:
+        return zoneinfo.ZoneInfo(name)
+    except zoneinfo.ZoneInfoNotFoundError as e:
+        raise UnknownTimeZone(e.args[0]) from None