jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poezio/poezio#3472: Ensure tz is correctly set when offset is an int

Browse Source 
Thanks lovetox!

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-04-03 23:16:37 +01:00
parent 2dda6b80d4
commit 0042108a67
No known key found for this signature in database
GPG Key ID: DEDA74AEECA9D0F2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slixmpp/plugins/xep_0082.py
View File

@ -130,7 +130,7 @@ def time(hour=None, min=None, sec=None, micro=None, offset=None, obj=False):
sec = now.second sec = now.second
if micro is None: if micro is None:
micro = now.microsecond micro = now.microsecond
if offset is None: if offset in (None, 0):
offset = tzutc() offset = tzutc()
elif not isinstance(offset, dt.tzinfo): elif not isinstance(offset, dt.tzinfo):
offset = tzoffset(None, offset) offset = tzoffset(None, offset)
@ -177,7 +177,7 @@ def datetime(year=None, month=None, day=None, hour=None,
sec = now.second sec = now.second
if micro is None: if micro is None:
micro = now.microsecond micro = now.microsecond
if offset is None: if offset in (None, 0):
offset = tzutc() offset = tzutc()
elif not isinstance(offset, dt.tzinfo): elif not isinstance(offset, dt.tzinfo):
offset = tzoffset(None, offset) offset = tzoffset(None, offset)