Skip to content
This repository was archived by the owner on Aug 8, 2024. It is now read-only.

Issue#19 Bug Fix: tz "+0435" was being read as "+0403" should be. #20

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Issue#19 Bug Fix: tz "+0435" was being read as "+0403" should be. #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apache_log_parser/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def __init__(self, string):
string = string

hr_offset = int(string[0:2], 10)
min_offset = int(string[2:3], 10)
min_offset = int(string[2:4], 10)
min_offset = hr_offset * 60 + min_offset
min_offset = direction * min_offset

Expand Down
18 changes: 16 additions & 2 deletions apache_log_parser/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ def test_pr8(self):
'server_port_local': '443', 'request_method': 'GET',
'server_port_remote': '50153', 'env_unique_id': 'VHhIfKwQGCMAAEiMUIAAAAF',
'time_received_datetimeobj': datetime.datetime(2014, 11, 28, 10, 3, 40),
'time_received_isoformat': '2014-11-28T10:03:40', 'remote_host': '127.0.0.1',
'time_received_isoformat': '2014-11-28T10:03:40',
'time_received': '[28/Nov/2014:10:03:40 +0000]',
'time_received_tz_datetimeobj': datetime.datetime(2014, 11, 28, 10, 3, 40, tzinfo=apache_log_parser.FixedOffset("0000")),
'time_received_tz_isoformat': '2014-11-28T10:03:40+00:00', 'remote_host': '127.0.0.1',
'time_received_tz_isoformat': '2014-11-28T10:03:40+00:00',
'time_received_utc_datetimeobj': datetime.datetime(2014, 11, 28, 10, 3, 40, tzinfo=apache_log_parser.FixedOffset("0000")),
'time_received_utc_isoformat': '2014-11-28T10:03:40+00:00', 'remote_host': '127.0.0.1',
'extension_ssl_cipher': 'MY-CYPHER',
Expand Down Expand Up @@ -134,6 +134,20 @@ def test_issue10_ipv6(self):
def test_doctest_readme(self):
doctest.testfile("../README.md")

def test_timezone_issue(self):
parser = apache_log_parser.Parser("%t")
log = "[08/Mar/2015:18:06:58 -0435]"
data = parser.parse(log)
self.assertEqual(data, {
'time_received': '[08/Mar/2015:18:06:58 -0435]',
'time_received_datetimeobj': datetime.datetime(2015, 3, 8, 18, 6, 58),
'time_received_isoformat': '2015-03-08T18:06:58',
'time_received_tz_datetimeobj': datetime.datetime(2015, 3, 8, 18, 6, 58, tzinfo=apache_log_parser.FixedOffset('-0435')),

'time_received_tz_isoformat': '2015-03-08T18:06:58-04:35',
'time_received_utc_datetimeobj': datetime.datetime(2015, 3, 8, 22, 41, 58, tzinfo=apache_log_parser.FixedOffset('0000')),
'time_received_utc_isoformat': '2015-03-08T22:41:58+00:00',
})


if __name__ == '__main__':
Expand Down