Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont unnecessarily duplicate code

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-03 21:22:38 +05:30
parent a7ffb4de1b
commit c12196bd43
1 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/calibre/utils/date.py
View File

@ -6,11 +6,11 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import re, time import re
from datetime import datetime, time as dtime, timedelta, MINYEAR, MAXYEAR from datetime import datetime, time as dtime, timedelta, MINYEAR, MAXYEAR
from functools import partial from functools import partial
from dateutil.tz import tzlocal, tzutc, EPOCHORDINAL from dateutil.tz import tzlocal, tzutc
from calibre import strftime from calibre import strftime
from calibre.constants import iswindows, isosx, plugins from calibre.constants import iswindows, isosx, plugins
@ -19,34 +19,11 @@ from calibre.utils.localization import lcdata
class SafeLocalTimeZone(tzlocal): class SafeLocalTimeZone(tzlocal):
def _isdst(self, dt): def _isdst(self, dt):
# We can't use mktime here. It is unstable when deciding if # This method in tzlocal raises ValueError if dt is out of range.
# the hour near to a change is DST or not. # In such cases, just assume that dt is not DST.
#
# timestamp = time.mktime((dt.year, dt.month, dt.day, dt.hour,
# dt.minute, dt.second, dt.weekday(), 0, -1))
# return time.localtime(timestamp).tm_isdst
#
# The code above yields the following result:
#
# >>> import tz, datetime
# >>> t = tz.tzlocal()
# >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
# 'BRDT'
# >>> datetime.datetime(2003,2,16,0,tzinfo=t).tzname()
# 'BRST'
# >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
# 'BRST'
# >>> datetime.datetime(2003,2,15,22,tzinfo=t).tzname()
# 'BRDT'
# >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
# 'BRDT'
#
# Here is a more stable implementation:
#
try: try:
timestamp = ((dt.toordinal() - EPOCHORDINAL) * 86400 + dt.hour * 3600 + dt.minute * 60 + dt.second) tzlocal._isdst(self, dt)
return time.localtime(timestamp+time.timezone).tm_isdst except Exception:
except ValueError:
pass pass
return False return False