tools (datetime, utils): fix incorrect use of naive object:
`tools.datetime.format_datetime` was expecting aware datetime objects while `tools.utils.xmpp_date` was returning naive datetime objects. A check has been added to the former one, and latter one has been modified to return aware datetime objects.
This commit is contained in:
parent
d1b5ff0c41
commit
ed3660c4a7
1 changed files with 13 additions and 7 deletions
|
|
@ -152,8 +152,9 @@ def xmpp_date(
|
|||
@param with_time(bool): if True include the time
|
||||
@return(unicode): XEP-0082 formatted date and time
|
||||
"""
|
||||
dtime = datetime.datetime.utcfromtimestamp(
|
||||
time.time() if timestamp is None else timestamp
|
||||
dtime = datetime.datetime.fromtimestamp(
|
||||
time.time() if timestamp is None else timestamp,
|
||||
datetime.timezone.utc
|
||||
)
|
||||
|
||||
return format_datetime(dtime) if with_time else format_date(dtime.date())
|
||||
|
|
|
|||
Loading…
Reference in a new issue