paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugdown: Use standard library datetime.timezone.utc.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-06-18 14:30:24 -07:00
committed by Tim Abbott
parent e87df351f7
commit b2cb992d9f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/bugdown/__init__.py
View File

@@ -33,7 +33,6 @@ import ahocorasick
import dateutil.parser
import dateutil.tz
import markdown
import pytz
import requests
from django.conf import settings
from django.db.models import Q
@@ -1250,9 +1249,9 @@ class Timestamp(markdown.inlinepatterns.Pattern):
# Use HTML5 <time> element for valid timestamps.
time_element = Element('time')
if timestamp.tzinfo:
timestamp = timestamp.astimezone(pytz.utc)
timestamp = timestamp.astimezone(datetime.timezone.utc)
else:
timestamp = pytz.utc.localize(timestamp)
timestamp = timestamp.replace(tzinfo=datetime.timezone.utc)
time_element.set('datetime', timestamp.isoformat().replace('+00:00', 'Z'))
# Set text to initial input, so simple clients translating
# HTML to text will at least display something.