mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

strptime(): The code that was adding 12 to PM hours was incorrect

Browse source 
because it added it to 12 PM too.  12 PM should be hour 12 not hour
24.

Also cleaned up a minor style nit.  There are more style problems in
this file that I'll clean up next (but I didn't want them to overwhelm
the substance of this fix).
This commit is contained in:
Barry Warsaw 2002-08-29 15:29:49 +00:00
parent 375e0eeacc
commit 2bdb61479d
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/_strptime.py
View file

@ -415,12 +415,19 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
hour = int(found_dict['H'])
else:
hour = int(found_dict['I'])
if found_dict.has_key('p'):
if found_dict['p'] == locale_time.am_pm[1]:
ampm = found_dict.get('p')
if ampm == locale_time.am_pm[0]:
# We're in AM so the hour is correct unless we're
# looking at 12 midnight.
# 12 midnight == 12 AM == hour 0
if hour == 12:
hour = 0
elif ampm == locale_time.am_pm[1]:
# We're in PM so we need to add 12 to the hour unless
# we're looking at 12 noon.
# 12 noon == 12 PM == hour 12
if hour != 12:
hour += 12
else:
if hour is 12:
hour = 0
elif group_key is 'M':
minute = int(found_dict['M'])
elif group_key is 'S':