From e223b507ddd88217404025609571f34696d0e375 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 7 Dec 2021 23:30:16 +0100 Subject: [PATCH] utils.time: Add support for timezones without a slash. eg. UTC, CET, ... --- plugins/Time/test.py | 1 + src/utils/time.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Time/test.py b/plugins/Time/test.py index f85c3e621..2cb5d31ad 100644 --- a/plugins/Time/test.py +++ b/plugins/Time/test.py @@ -96,6 +96,7 @@ class TimeTestCase(PluginTestCase): def testTztime(self): self.assertNotError('tztime Europe/Paris') self.assertNotError('tztime America/Indiana/Knox') + self.assertNotError('tztime UTC') self.assertError('tztime Europe/Gniarf') @skipIf(not has_dateutil, 'python-dateutil is missing') diff --git a/src/utils/time.py b/src/utils/time.py index 7b66a3a57..0dcbb3b27 100644 --- a/src/utils/time.py +++ b/src/utils/time.py @@ -41,7 +41,7 @@ try: except ImportError: pytz = None -_IANA_TZ_RE = re.compile("([\w_-]+/)+[\w_-]+") +_IANA_TZ_RE = re.compile("([\w_-]+/)*[\w_-]+") class TimezoneException(Exception): pass