From: Brett Cannon Date: Mon, 29 Aug 2005 18:25:55 +0000 (+0000) Subject: Fix logic error introduced in last commit. Also add a comment to explain what X-Git-Tag: v2.5a0~1430 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1b2ba6aa1751c5325e8fb87a28e54a857796bfa;p=thirdparty%2FPython%2Fcpython.git Fix logic error introduced in last commit. Also add a comment to explain what the code is doing. --- diff --git a/Lib/_strptime.py b/Lib/_strptime.py index aa02ba12c831..90928ffca8d2 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]