summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2005-08-29 18:25:55 (GMT)
committerBrett Cannon <bcannon@gmail.com>2005-08-29 18:25:55 (GMT)
commitf1b2ba6aa1751c5325e8fb87a28e54a857796bfa (patch)
tree9714bfb412442a6f7094b7383b03d1a04596b7ba
parentc20337076977c843dfdcfc20e30d71eee2a0504b (diff)
downloadcpython-f1b2ba6aa1751c5325e8fb87a28e54a857796bfa.zip
cpython-f1b2ba6aa1751c5325e8fb87a28e54a857796bfa.tar.gz
cpython-f1b2ba6aa1751c5325e8fb87a28e54a857796bfa.tar.bz2
Fix logic error introduced in last commit. Also add a comment to explain what
the code is doing.
-rw-r--r--Lib/_strptime.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index aa02ba1..90928ff 100644
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -147,11 +147,14 @@ class LocaleTime(object):
# strings (e.g., MacOS 9 having timezone as ('','')).
if old:
current_format = current_format.replace(old, new)
+ # If %W is used, then Sunday, 2005-01-03 will fall on week 0 since
+ # 2005-01-03 occurs before the first Monday of the year. Otherwise
+ # %U is used.
time_tuple = time.struct_time((1999,1,3,1,1,1,6,3,0))
if '00' in time.strftime(directive, time_tuple):
- U_W = '%U'
- else:
U_W = '%W'
+ else:
+ U_W = '%U'
date_time[offset] = current_format.replace('11', U_W)
self.LC_date_time = date_time[0]
self.LC_date = date_time[1]