Merge pull request #2367 from beetbox/timestamp-36

Use a new stdlib method for dbcore.query._to_epoch_time on Python 3
This commit is contained in:
Adrian Sampson 2017-01-02 18:45:36 -05:00 committed by GitHub
commit 2fcde98d4b

View file

@ -503,9 +503,13 @@ def _to_epoch_time(date):
"""Convert a `datetime` object to an integer number of seconds since
the (local) Unix epoch.
"""
epoch = datetime.fromtimestamp(0)
delta = date - epoch
return int(delta.total_seconds())
if hasattr(date, 'timestamp'):
# The `timestamp` method exists on Python 3.3+.
return int(date.timestamp())
else:
epoch = datetime.fromtimestamp(0)
delta = date - epoch
return int(delta.total_seconds())
def _parse_periods(pattern):