haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 01:44:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1880 from haiwen/timestamp

Browse Source 
update timeutil: global variable
This commit is contained in:
Daniel Pan
2017-10-28 16:18:20 +08:00
committed by GitHub
parent c1d7b588e3 5f33ebafeb
commit aa580c7008
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
seahub/utils/timeutils.py
View File

@@ -38,6 +38,7 @@ def utc_to_local(dt):
local = timezone.make_naive(utc, tz) local = timezone.make_naive(utc, tz)
return local return local
pytz_obj = pytz.timezone(settings.TIME_ZONE)
def timestamp_to_isoformat_timestr(timestamp): def timestamp_to_isoformat_timestr(timestamp):
try: try:
min_ts = -(1 << 31) min_ts = -(1 << 31)
@@ -48,7 +49,6 @@ def timestamp_to_isoformat_timestr(timestamp):
dt_obj = datetime.datetime.fromtimestamp(timestamp/1000000) dt_obj = datetime.datetime.fromtimestamp(timestamp/1000000)
dt_obj = dt_obj.replace(microsecond=0) dt_obj = dt_obj.replace(microsecond=0)
pytz_obj = pytz.timezone(settings.TIME_ZONE)
isoformat_timestr = pytz_obj.localize(dt_obj).isoformat() isoformat_timestr = pytz_obj.localize(dt_obj).isoformat()
return isoformat_timestr return isoformat_timestr
except Exception as e: except Exception as e:
@@ -58,7 +58,6 @@ def timestamp_to_isoformat_timestr(timestamp):
def datetime_to_isoformat_timestr(datetime): def datetime_to_isoformat_timestr(datetime):
try: try:
datetime = datetime.replace(microsecond=0) datetime = datetime.replace(microsecond=0)
pytz_obj = pytz.timezone(settings.TIME_ZONE)
isoformat_timestr = pytz_obj.localize(datetime).isoformat() isoformat_timestr = pytz_obj.localize(datetime).isoformat()
return isoformat_timestr return isoformat_timestr
except Exception as e: except Exception as e: