Put back old code with time conversion on naive datetime

This commit is contained in:
ChoiHwaa 2022-06-18 21:16:32 +01:00 committed by GitHub
parent 9e0dd88d6d
commit 349835d535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,30 @@
import base64 import base64
import json import json
import struct import struct
from datetime import datetime, date, timedelta import time
from datetime import date, datetime, timedelta, timezone
_EPOCH_NAIVE = datetime(*time.gmtime(0)[:6])
_EPOCH_NAIVE_LOCAL = datetime(*time.localtime(0)[:6])
_EPOCH = _EPOCH_NAIVE.replace(tzinfo=timezone.utc)
def _datetime_to_timestamp(dt):
tz = 0
# If no timezone is specified, it is assumed to be in utc zone
if dt.tzinfo is None:
dt = dt.replace(tzinfo=timezone.utc)
# The offsets are in the opposite direction which is convenient.
tz = time.altzone if time.daylight else time.timezone
# We use .total_seconds() method instead of simply dt.timestamp(),
# because on Windows the latter raises OSError on datetimes ~< datetime(1970,1,1)
secs = int((dt - _EPOCH).total_seconds())
# Time zone conversion to UTC. Result can be negative when secs is 0
# but I think that is fine.
secs = secs + tz
# Make sure it's a valid signed 32 bit integer, as used by Telegram.
# This does make very large dates wrap around, but it's the best we
# can do with Telegram's limitations.
return struct.unpack('i', struct.pack('I', secs & 0xffffffff))[0]
def _json_default(value): def _json_default(value):
if isinstance(value, bytes): if isinstance(value, bytes):
@ -123,22 +146,14 @@ class TLObject:
if not dt and not isinstance(dt, timedelta): if not dt and not isinstance(dt, timedelta):
return b'\0\0\0\0' return b'\0\0\0\0'
# We should use the time zone of the user. if isinstance(dt, datetime):
try: dt = _datetime_to_timestamp(dt)
if isinstance(dt, datetime): elif isinstance(dt, date):
dt = int(dt.timestamp()) dt = _datetime_to_timestamp(datetime(dt.year, dt.month, dt.day))
elif isinstance(dt, date): elif isinstance(dt, float):
dt = int(datetime(dt.year, dt.month, dt.day).timestamp()) dt = int(dt)
elif isinstance(dt, float): elif isinstance(dt, timedelta):
dt = int(dt) dt = _datetime_to_timestamp((datetime.now() + dt))
elif isinstance(dt, timedelta):
dt = int((datetime.now() + dt).timestamp())
except OSError:
dt = 0
# 2145916800 is the date 2038-01-01.
if dt > 2145916800:
raise ValueError("Date is outside the range of valid values.")
if isinstance(dt, int): if isinstance(dt, int):
return struct.pack('<i', dt) return struct.pack('<i', dt)