Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Don't use 'Z' for "utc timezone" - actually parse timezone out of datetimes

Browse source
This commit is contained in:
jesopo 2019-08-30 13:25:19 +01:00
parent 0d9bd57332
commit d3ed08e336
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/utils/__init__.py
View file

@ -7,17 +7,24 @@ class Direction(enum.Enum):
ISO8601_PARSE = "%Y-%m-%dT%H:%M:%S%z" ISO8601_PARSE = "%Y-%m-%dT%H:%M:%S%z"
ISO8601_PARSE_MICROSECONDS = "%Y-%m-%dT%H:%M:%S.%f%z" ISO8601_PARSE_MICROSECONDS = "%Y-%m-%dT%H:%M:%S.%f%z"
ISO8601_FORMAT_DT = "%Y-%m-%dT%H:%M:%S"
ISO8601_FORMAT_TZ = "%z"
DATETIME_HUMAN = "%Y/%m/%d %H:%M:%S" DATETIME_HUMAN = "%Y/%m/%d %H:%M:%S"
def iso8601_format(dt: datetime.datetime, milliseconds: bool=False) -> str: def iso8601_format(dt: datetime.datetime, milliseconds: bool=False) -> str:
timespec = "seconds" dt_format = dt.strftime(ISO8601_FORMAT_DT)
if milliseconds: tz_format = dt.strftime(ISO8601_FORMAT_TZ)
timespec = "milliseconds"
formatted = dt.isoformat(timespec=timespec) ms_format = ""
return "%sZ" % formatted if milliseconds:
def iso8601_format_now() -> str: ms_format = ".%d" % (dt.microsecond/1000)
return iso8601_format(datetime.datetime.utcnow()) return "%s%s%s" % (dt_format, ms_format, tz_format)
def iso8601_format_now(milliseconds: bool=False) -> str:
now = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)
return iso8601_format(now, milliseconds=milliseconds)
def iso8601_parse(s: str, microseconds: bool=False) -> datetime.datetime: def iso8601_parse(s: str, microseconds: bool=False) -> datetime.datetime:
fmt = ISO8601_PARSE_MICROSECONDS if microseconds else ISO8601_PARSE fmt = ISO8601_PARSE_MICROSECONDS if microseconds else ISO8601_PARSE
return datetime.datetime.strptime(s, fmt) return datetime.datetime.strptime(s, fmt)