From 9e6c2924222e26abbee055c0539cd3d97109f093 Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Tue, 16 Aug 2016 21:50:21 +0100 Subject: [PATCH] fix incorrect caputation of timestamp in some cases --- aprslib/parsing/common.py | 4 +--- tests/test_parse_common.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/aprslib/parsing/common.py b/aprslib/parsing/common.py index 6c0585d..185215b 100644 --- a/aprslib/parsing/common.py +++ b/aprslib/parsing/common.py @@ -1,5 +1,4 @@ import re -import time from datetime import datetime from aprslib import base91 from aprslib.exceptions import ParseError @@ -100,8 +99,7 @@ def parse_timestamp(body, packet_type=''): else: timestamp = "19700101000000" - timestamp = utc.strptime(timestamp, "%Y%m%d%H%M%S") - timestamp = time.mktime(timestamp.timetuple()) + timestamp = int((utc.strptime(timestamp, "%Y%m%d%H%M%S") - datetime(1970, 1, 1)).total_seconds()) except Exception as exp: timestamp = 0 logger.debug(exp) diff --git a/tests/test_parse_common.py b/tests/test_parse_common.py index d80b7c6..fc4c84a 100644 --- a/tests/test_parse_common.py +++ b/tests/test_parse_common.py @@ -2,7 +2,6 @@ import unittest2 as unittest import string from random import randint, randrange, sample from datetime import datetime -import time from aprslib import base91 from aprslib.parsing.common import * @@ -180,7 +179,7 @@ class TimestampTC(unittest.TestCase): def test_timestamp_valid(self): date = datetime.utcnow() - timestamp = time.mktime(date.timetuple()) + timestamp = int((date - datetime(1970, 1, 1)).total_seconds()) # hhmmss format body = date.strftime("%H%M%Shtext")