Skip to content

Fix 12am and 12pm being swapped in parseATTime #2925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Fix 12am and 12pm being swapped in parseATTime #2925

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
7 changes: 4 additions & 3 deletions webapp/graphite/render/attime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,21 +79,22 @@ def parseTimeReference(ref, tzinfo=None, now=None):
minute = int( ref[i+1:i+3] )
ref = ref[i+3:]
if ref[:2] == 'am':
hour = hour % 12
ref = ref[2:]
elif ref[:2] == 'pm':
hour = (hour + 12) % 24
hour = hour % 12 + 12
ref = ref[2:]

# Xam or XXam
i = ref.find('am')
if 0 < i < 3:
hour = int( ref[:i] )
hour = int( ref[:i] ) % 12
ref = ref[i+2:]

# Xpm or XXpm
i = ref.find('pm')
if 0 < i < 3:
hour = (int( ref[:i] ) + 12) % 24
hour = int( ref[:i] ) % 12 + 12
ref = ref[i+2:]

if ref.startswith('noon'):
Expand Down
30 changes: 30 additions & 0 deletions webapp/tests/test_attime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,26 @@ def test_parse_hour_only_pm(self):
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 22, 0))
self.assertEqual(time_ref, expected)

def test_parse_hour_only_twelve_am_is_midnight(self):
time_ref = parseTimeReference("12am")
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 0, 0))
self.assertEqual(time_ref, expected)

def test_parse_hour_only_twelve_pm_is_noon(self):
time_ref = parseTimeReference("12pm")
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 12, 0))
self.assertEqual(time_ref, expected)

def test_parse_hour_twelve_am(self):
time_ref = parseTimeReference("12:30am")
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 0, 30))
self.assertEqual(time_ref, expected)

def test_parse_hour_twelve_pm(self):
time_ref = parseTimeReference("12:30pm")
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 12, 30))
self.assertEqual(time_ref, expected)

def test_parse_noon(self):
time_ref = parseTimeReference("noon")
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 12, 0))
Expand Down Expand Up @@ -609,6 +629,16 @@ def test_parse_hour_only_pm(self):
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 22, 0))
self.assertEqual(time_ref, expected)

def test_parse_hour_only_twelve_am_is_midnight(self):
time_ref = parseTimeReference("12am", now=self.now)
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 0, 0))
self.assertEqual(time_ref, expected)

def test_parse_hour_only_twelve_pm_is_noon(self):
time_ref = parseTimeReference("12pm", now=self.now)
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 12, 0))
self.assertEqual(time_ref, expected)

def test_parse_noon(self):
time_ref = parseTimeReference("noon", now=self.now)
expected = self.zone.localize(datetime(self.MOCK_DATE.year, self.MOCK_DATE.month, self.MOCK_DATE.day, 12, 0))
Expand Down