From 3ec068f10cdccc2076cb6555a33c2cd0d3cbc328 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 18 Jun 2020 14:14:53 -0700 Subject: [PATCH] bugdown: Import datetime our normal way. --- zerver/lib/bugdown/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zerver/lib/bugdown/__init__.py b/zerver/lib/bugdown/__init__.py index 209d4cf692..c72f35bbf4 100644 --- a/zerver/lib/bugdown/__init__.py +++ b/zerver/lib/bugdown/__init__.py @@ -1,5 +1,6 @@ # Zulip's main markdown implementation. See docs/subsystems/markdown.md for # detailed documentation on our markdown syntax. +import datetime import functools import html import logging @@ -10,7 +11,6 @@ import urllib import urllib.parse from collections import defaultdict, deque from dataclasses import dataclass -from datetime import datetime from io import StringIO from typing import ( Any, @@ -1236,7 +1236,7 @@ class Timestamp(markdown.inlinepatterns.Pattern): timestamp = dateutil.parser.parse(time_input_string, tzinfos=get_common_timezones()) except ValueError: try: - timestamp = datetime.fromtimestamp(float(time_input_string)) + timestamp = datetime.datetime.fromtimestamp(float(time_input_string)) except ValueError: pass