Mailman 3 October 2004 - Python-checkins

python/dist/src/Misc NEWS, 1.831.4.153, 1.831.4.154
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27014/Misc Modified Files: Tag: release23-maint NEWS Log Message: Add support for using %U and %W in strptime when year and day of the week are also specified. Closes bug #1045381. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.153 retrieving revision 1.831.4.154 diff -u -d -r1.831.4.153 -r1.831.4.154 --- NEWS 6 Oct 2004 02:16:45 -0000 1.831.4.153 +++ NEWS 18 Oct 2004 01:56:17 -0000 1.831.4.154 @@ -53,6 +53,9 @@ Library ------- +- Bug #1045381: strptime() now uses %U and %W for date calculations if the year + and day of the week are also specified. + - Bug #1039270: Locale data is now escaped for regex metacharacters. - Bug #807871: Fix tkMessageBox.askyesno result.

1 0

python/dist/src/Lib/test test_strptime.py, 1.19.4.4, 1.19.4.5
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27014/Lib/test Modified Files: Tag: release23-maint test_strptime.py Log Message: Add support for using %U and %W in strptime when year and day of the week are also specified. Closes bug #1045381. Index: test_strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strptime.py,v retrieving revision 1.19.4.4 retrieving revision 1.19.4.5 diff -u -d -r1.19.4.4 -r1.19.4.5 --- test_strptime.py 29 Aug 2003 02:34:22 -0000 1.19.4.4 +++ test_strptime.py 18 Oct 2004 01:56:16 -0000 1.19.4.5 @@ -6,6 +6,7 @@ import re import sys from test import test_support +from datetime import date as datetime_date import _strptime @@ -450,6 +451,29 @@ "Calculation of day of the week failed;" "%s != %s" % (result.tm_wday, self.time_tuple.tm_wday)) + def test_week_of_year_and_day_of_week_calculation(self): + # Should be able to infer date if given year, week of year (%U or %W) + # and day of the week + def test_helper(ymd_tuple, test_reason): + for directive in ('W', 'U'): + format_string = "%%Y %%%s %%w" % directive + strp_input = datetime_date(*ymd_tuple).strftime(format_string) + strp_output = _strptime.strptime(strp_input, format_string) + self.failUnless(strp_output[:3] == ymd_tuple, + "%s(%s) test failed w/ '%s': %s != %s" % + (test_reason, directive, strp_input, + strp_output[:3], ymd_tuple[:3])) + test_helper((1901, 1, 3), "week 0") + test_helper((1901, 1, 8), "common case") + test_helper((1901, 1, 13), "day on Sunday") + test_helper((1901, 1, 14), "day on Monday") + test_helper((1905, 1, 1), "Jan 1 on Sunday") + test_helper((1906, 1, 1), "Jan 1 on Monday") + test_helper((1905, 12, 31), "Dec 31 on Sunday") + test_helper((1906, 12, 31), "Dec 31 on Monday") + + + class CacheTests(unittest.TestCase): """Test that caching works properly."""

1 0

python/dist/src/Doc/lib libtime.tex, 1.60.8.1, 1.60.8.2
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27014/Doc/lib Modified Files: Tag: release23-maint libtime.tex Log Message: Add support for using %U and %W in strptime when year and day of the week are also specified. Closes bug #1045381. Index: libtime.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libtime.tex,v retrieving revision 1.60.8.1 retrieving revision 1.60.8.2 diff -u -d -r1.60.8.1 -r1.60.8.2 --- libtime.tex 8 Sep 2003 18:55:01 -0000 1.60.8.1 +++ libtime.tex 18 Oct 2004 01:56:16 -0000 1.60.8.2 @@ -235,11 +235,11 @@ \lineiii{\%S}{Second as a decimal number [00,61].}{(1)} \lineiii{\%U}{Week number of the year (Sunday as the first day of the week) as a decimal number [00,53]. All days in a new year - preceding the first Sunday are considered to be in week 0.}{} + preceding the first Sunday are considered to be in week 0.}{(2)} \lineiii{\%w}{Weekday as a decimal number [0(Sunday),6].}{} \lineiii{\%W}{Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year - preceding the first Monday are considered to be in week 0.}{} + preceding the first Monday are considered to be in week 0.}{(2)} \lineiii{\%x}{Locale's appropriate date representation.}{} \lineiii{\%X}{Locale's appropriate time representation.}{} \lineiii{\%y}{Year without century as a decimal number [00,99].}{} @@ -255,6 +255,10 @@ \item[(1)] The range really is \code{0} to \code{61}; this accounts for leap seconds and the (very rare) double leap seconds. + \item[(2)] + When used with the \function{strptime()} function, \code{\%U} and \code{\%W} + are only used in calculations when the day of the week and the year are + specified. \end{description} Here is an example, a format for dates compatible with that specified

1 0

python/dist/src/Lib _strptime.py, 1.23.4.5, 1.23.4.6
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27014/Lib Modified Files: Tag: release23-maint _strptime.py Log Message: Add support for using %U and %W in strptime when year and day of the week are also specified. Closes bug #1045381. Index: _strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_strptime.py,v retrieving revision 1.23.4.5 retrieving revision 1.23.4.6 diff -u -d -r1.23.4.5 -r1.23.4.6 --- _strptime.py 6 Oct 2004 02:16:45 -0000 1.23.4.5 +++ _strptime.py 18 Oct 2004 01:56:16 -0000 1.23.4.6 @@ -311,7 +311,7 @@ # W is set below by using 'U' 'y': r"(?P<y>\d\d)", 'Y': r"(?P<Y>\d\d\d\d)"}) - base.__setitem__('W', base.__getitem__('U')) + base.__setitem__('W', base.__getitem__('U').replace('U', 'W')) if locale_time: self.locale_time = locale_time else: @@ -431,6 +431,8 @@ month = day = 1 hour = minute = second = 0 tz = -1 + week_of_year = -1 + week_of_year_start = -1 # weekday and julian defaulted to -1 so as to signal need to calculate values weekday = julian = -1 found_dict = found.groupdict() @@ -490,6 +492,14 @@ weekday -= 1 elif group_key == 'j': julian = int(found_dict['j']) + elif group_key in ('U', 'W'): + week_of_year = int(found_dict[group_key]) + if group_key == 'U': + # U starts week on Sunday + week_of_year_start = 6 + else: + # W starts week on Monday + week_of_year_start = 0 elif group_key == 'Z': # Since -1 is default value only need to worry about setting tz if # it can be something other than -1. @@ -505,7 +515,32 @@ elif time.daylight and \ locale_time.timezone[3].lower() == found_zone: tz = 1 - + # If we know the week of the year and what day of that week, we can figure + # out the Julian day of the year + # Calculations below assume 0 is a Monday + if julian == -1 and week_of_year != -1 and weekday != -1 and year != -1: + # Adjust for U directive so that calculations are not dependent on + # directive used to figure out week of year + if weekday == 6 and week_of_year_start == 6: + week_of_year -= 1 + # For some reason when Dec 31 falls on a Monday the week of the year is + # off by a week; verified on both OS X and Solaris. + elif weekday == 0 and week_of_year_start == 6 and week_of_year >= 52: + week_of_year += 1 + # Calculate how many days in week 0 + first_weekday = datetime_date(year, 1, 1).weekday() + preceeding_days = 7 - first_weekday + if preceeding_days == 7: + preceeding_days = 0 + # If in week 0, then just figure out how many days from Jan 1 to day of + # week specified, else calculate by multiplying week of year by 7, + # adding in days in week 0, and the number of days from Monday to the + # day of the week + if not week_of_year: + julian = 1 + weekday - first_weekday + else: + days_to_week = preceeding_days + (7 * (week_of_year - 1)) + julian = 1 + days_to_week + weekday # Cannot pre-calculate datetime_date() since can change in Julian #calculation and thus could have different value for the day of the week #calculation

1 0

python/dist/src/Doc/lib libtime.tex,1.68,1.69
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26307/Doc/lib Modified Files: libtime.tex Log Message: Clarify note about using %U and %W with strptime(). Index: libtime.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libtime.tex,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- libtime.tex 18 Oct 2004 01:37:57 -0000 1.68 +++ libtime.tex 18 Oct 2004 01:53:15 -0000 1.69 @@ -272,8 +272,9 @@ The range really is \code{0} to \code{61}; this accounts for leap seconds and the (very rare) double leap seconds. \item[(3)] - \code{\%U} and \code{\%W} are only used in calculations when the day of the - week and the year are specified. + When used with the \function{strptime()} function, \code{\%U} and \code{\%W} + are only used in calculations when the day of the week and the year are + specified. \end{description} Here is an example, a format for dates compatible with that specified

1 0

python/dist/src/Lib _strptime.py,1.36,1.37
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25257/Lib Modified Files: _strptime.py Log Message: Fix comments. Index: _strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_strptime.py,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- _strptime.py 18 Oct 2004 01:37:57 -0000 1.36 +++ _strptime.py 18 Oct 2004 01:47:46 -0000 1.37 @@ -298,9 +298,12 @@ month = day = 1 hour = minute = second = 0 tz = -1 + # Default to -1 to signify that values not known; not critical to have, + # though week_of_year = -1 week_of_year_start = -1 - # weekday and julian defaulted to -1 so as to signal need to calculate values + # weekday and julian defaulted to -1 so as to signal need to calculate + # values weekday = julian = -1 found_dict = found.groupdict() for group_key in found_dict.iterkeys(): @@ -388,7 +391,6 @@ # If we know the week of the year and what day of that week, we can figure # out the Julian day of the year # Calculations below assume 0 is a Monday - # XXX only works for W if julian == -1 and week_of_year != -1 and weekday != -1 and year != -1: # Adjust for U directive so that calculations are not dependent on # directive used to figure out week of year

1 0

python/dist/src/Doc/lib libtime.tex,1.67,1.68
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22698/Doc/lib Modified Files: libtime.tex Log Message: Add support for %U and %W to contribute to calculating the date when the year and day of the week are specified. Closes bug #1045381. Index: libtime.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libtime.tex,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- libtime.tex 28 Sep 2004 18:30:03 -0000 1.67 +++ libtime.tex 18 Oct 2004 01:37:57 -0000 1.68 @@ -247,11 +247,11 @@ \lineiii{\%S}{Second as a decimal number [00,61].}{(2)} \lineiii{\%U}{Week number of the year (Sunday as the first day of the week) as a decimal number [00,53]. All days in a new year - preceding the first Sunday are considered to be in week 0.}{} + preceding the first Sunday are considered to be in week 0.}{(3)} \lineiii{\%w}{Weekday as a decimal number [0(Sunday),6].}{} \lineiii{\%W}{Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year - preceding the first Monday are considered to be in week 0.}{} + preceding the first Monday are considered to be in week 0.}{(3)} \lineiii{\%x}{Locale's appropriate date representation.}{} \lineiii{\%X}{Locale's appropriate time representation.}{} \lineiii{\%y}{Year without century as a decimal number [00,99].}{} @@ -271,6 +271,9 @@ \item[(2)] The range really is \code{0} to \code{61}; this accounts for leap seconds and the (very rare) double leap seconds. + \item[(3)] + \code{\%U} and \code{\%W} are only used in calculations when the day of the + week and the year are specified. \end{description} Here is an example, a format for dates compatible with that specified

1 0

python/dist/src/Misc NEWS,1.1165,1.1166
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22698/Misc Modified Files: NEWS Log Message: Add support for %U and %W to contribute to calculating the date when the year and day of the week are specified. Closes bug #1045381. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1165 retrieving revision 1.1166 diff -u -d -r1.1165 -r1.1166 --- NEWS 18 Oct 2004 01:32:09 -0000 1.1165 +++ NEWS 18 Oct 2004 01:37:57 -0000 1.1166 @@ -22,7 +22,8 @@ Library ------- -... +- Bug #1045381: time.strptime() can now infer the date using %U or %W (week of + the year) when the day of the week and year are also specified. Build -----

1 0

python/dist/src/Lib/test test_strptime.py, 1.27, 1.28
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22698/Lib/test Modified Files: test_strptime.py Log Message: Add support for %U and %W to contribute to calculating the date when the year and day of the week are specified. Closes bug #1045381. Index: test_strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strptime.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- test_strptime.py 6 Oct 2004 02:11:36 -0000 1.27 +++ test_strptime.py 18 Oct 2004 01:37:57 -0000 1.28 @@ -6,6 +6,7 @@ import re import sys from test import test_support +from datetime import date as datetime_date import _strptime @@ -417,6 +418,27 @@ "Calculation of day of the week failed;" "%s != %s" % (result.tm_wday, self.time_tuple.tm_wday)) + def test_week_of_year_and_day_of_week_calculation(self): + # Should be able to infer date if given year, week of year (%U or %W) + # and day of the week + def test_helper(ymd_tuple, test_reason): + for directive in ('W', 'U'): + format_string = "%%Y %%%s %%w" % directive + strp_input = datetime_date(*ymd_tuple).strftime(format_string) + strp_output = _strptime.strptime(strp_input, format_string) + self.failUnless(strp_output[:3] == ymd_tuple, + "%s(%s) test failed w/ '%s': %s != %s" % + (test_reason, directive, strp_input, + strp_output[:3], ymd_tuple[:3])) + test_helper((1901, 1, 3), "week 0") + test_helper((1901, 1, 8), "common case") + test_helper((1901, 1, 13), "day on Sunday") + test_helper((1901, 1, 14), "day on Monday") + test_helper((1905, 1, 1), "Jan 1 on Sunday") + test_helper((1906, 1, 1), "Jan 1 on Monday") + test_helper((1905, 12, 31), "Dec 31 on Sunday") + test_helper((1906, 12, 31), "Dec 31 on Monday") + class CacheTests(unittest.TestCase): """Test that caching works properly."""

1 0

python/dist/src/Lib _strptime.py,1.35,1.36
by bcannon＠users.sourceforge.net 18 Oct '04

18 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22698/Lib Modified Files: _strptime.py Log Message: Add support for %U and %W to contribute to calculating the date when the year and day of the week are specified. Closes bug #1045381. Index: _strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_strptime.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- _strptime.py 6 Oct 2004 22:48:58 -0000 1.35 +++ _strptime.py 18 Oct 2004 01:37:57 -0000 1.36 @@ -212,7 +212,7 @@ for tz in tz_names), 'Z'), '%': '%'}) - base.__setitem__('W', base.__getitem__('U')) + base.__setitem__('W', base.__getitem__('U').replace('U', 'W')) base.__setitem__('c', self.pattern(self.locale_time.LC_date_time)) base.__setitem__('x', self.pattern(self.locale_time.LC_date)) base.__setitem__('X', self.pattern(self.locale_time.LC_time)) @@ -298,10 +298,17 @@ month = day = 1 hour = minute = second = 0 tz = -1 + week_of_year = -1 + week_of_year_start = -1 # weekday and julian defaulted to -1 so as to signal need to calculate values weekday = julian = -1 found_dict = found.groupdict() for group_key in found_dict.iterkeys(): + # Directives not explicitly handled below: + # c, x, X + # handled by making out of other directives + # U, W + # worthless without day of the week if group_key == 'y': year = int(found_dict['y']) # Open Group specification for strptime() states that a %y @@ -355,6 +362,14 @@ weekday -= 1 elif group_key == 'j': julian = int(found_dict['j']) + elif group_key in ('U', 'W'): + week_of_year = int(found_dict[group_key]) + if group_key == 'U': + # U starts week on Sunday + week_of_year_start = 6 + else: + # W starts week on Monday + week_of_year_start = 0 elif group_key == 'Z': # Since -1 is default value only need to worry about setting tz if # it can be something other than -1. @@ -370,6 +385,33 @@ else: tz = value break + # If we know the week of the year and what day of that week, we can figure + # out the Julian day of the year + # Calculations below assume 0 is a Monday + # XXX only works for W + if julian == -1 and week_of_year != -1 and weekday != -1 and year != -1: + # Adjust for U directive so that calculations are not dependent on + # directive used to figure out week of year + if weekday == 6 and week_of_year_start == 6: + week_of_year -= 1 + # For some reason when Dec 31 falls on a Monday the week of the year is + # off by a week; verified on both OS X and Solaris. + elif weekday == 0 and week_of_year_start == 6 and week_of_year >= 52: + week_of_year += 1 + # Calculate how many days in week 0 + first_weekday = datetime_date(year, 1, 1).weekday() + preceeding_days = 7 - first_weekday + if preceeding_days == 7: + preceeding_days = 0 + # If in week 0, then just figure out how many days from Jan 1 to day of + # week specified, else calculate by multiplying week of year by 7, + # adding in days in week 0, and the number of days from Monday to the + # day of the week + if not week_of_year: + julian = 1 + weekday - first_weekday + else: + days_to_week = preceeding_days + (7 * (week_of_year - 1)) + julian = 1 + days_to_week + weekday # Cannot pre-calculate datetime_date() since can change in Julian #calculation and thus could have different value for the day of the week #calculation

1 0