From 0042108a67019e6e65b95519643bb965423abc67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Wed, 3 Apr 2019 23:16:37 +0100 Subject: poezio/poezio#3472: Ensure tz is correctly set when offset is an int MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks lovetox! Signed-off-by: Maxime “pep” Buquet --- slixmpp/plugins/xep_0082.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slixmpp/plugins/xep_0082.py b/slixmpp/plugins/xep_0082.py index 24436622..a0b22a2f 100644 --- a/slixmpp/plugins/xep_0082.py +++ b/slixmpp/plugins/xep_0082.py @@ -130,7 +130,7 @@ def time(hour=None, min=None, sec=None, micro=None, offset=None, obj=False): sec = now.second if micro is None: micro = now.microsecond - if offset is None: + if offset in (None, 0): offset = tzutc() elif not isinstance(offset, dt.tzinfo): offset = tzoffset(None, offset) @@ -177,7 +177,7 @@ def datetime(year=None, month=None, day=None, hour=None, sec = now.second if micro is None: micro = now.microsecond - if offset is None: + if offset in (None, 0): offset = tzutc() elif not isinstance(offset, dt.tzinfo): offset = tzoffset(None, offset) -- cgit v1.2.3