Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 13:19:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix Python 2.6 compatibility.

Browse Source
This commit is contained in:
Valentin Lorentz 2015-08-26 17:59:50 +02:00
parent da12678b2d
commit a905828b26
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils/minisix.py
View File

@ -29,6 +29,8 @@
"""Restricted equivalent to six.""" """Restricted equivalent to six."""
from __future__ import division
import sys import sys
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
@ -49,13 +51,16 @@ if sys.version_info[0] >= 3:
def make_datetime_utc(dt): def make_datetime_utc(dt):
import datetime import datetime
return dt.replace(tzinfo=datetime.timezone.utc) return dt.replace(tzinfo=datetime.timezone.utc)
def timedelta__totalseconds(td):
return td.total_seconds()
if sys.version_info >= (3, 3): if sys.version_info >= (3, 3):
def datetime__timestamp(dt): def datetime__timestamp(dt):
return dt.timestamp() return dt.timestamp()
else: else:
def datetime__timestamp(dt): def datetime__timestamp(dt):
import datetime import datetime
return (dt - datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)).total_seconds() td = dt - datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)
return timedelta__totalseconds(td)
else: else:
PY2 = True PY2 = True
PY3 = False PY3 = False
@ -85,10 +90,17 @@ else:
'Python and may lead to incorrect results. You should ' 'Python and may lead to incorrect results. You should '
'consider upgrading to Python 3.') 'consider upgrading to Python 3.')
return dt.replace(tzinfo=None) return dt.replace(tzinfo=None)
if sys.version_info >= (2, 7):
def timedelta__totalseconds(td):
return td.total_seconds()
else:
def timedelta__totalseconds(td):
return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
def datetime__timestamp(dt): def datetime__timestamp(dt):
from .. import log from .. import log
import datetime import datetime
log.warning('Timezones are not available on this version of ' log.warning('Timezones are not available on this version of '
'Python and may lead to incorrect results. You should ' 'Python and may lead to incorrect results. You should '
'consider upgrading to Python 3.') 'consider upgrading to Python 3.')
return (dt - datetime.datetime(1970, 1, 1)).total_seconds() return timedelta__totalseconds(dt - datetime.datetime(1970, 1, 1))