Mailman 3 January 2007 - Python-checkins

r53570 - python/trunk/Lib/_strptime.py python/trunk/Lib/dummy_thread.py python/trunk/Lib/dummy_threading.py
by brett.cannon Jan. 25, 2007

Jan. 25, 2007

Author: brett.cannon Date: Fri Jan 26 00:30:39 2007 New Revision: 53570 Modified: python/trunk/Lib/_strptime.py python/trunk/Lib/dummy_thread.py python/trunk/Lib/dummy_threading.py Log: Remove specific mention of my name and email address from modules. Not really needed and all bug reports should go to the bug tracker, not directly to me. Plus I am not the only person to have edited these files at this point. Modified: python/trunk/Lib/_strptime.py ============================================================================== --- python/trunk/Lib/_strptime.py (original) +++ python/trunk/Lib/_strptime.py Fri Jan 26 00:30:39 2007 @@ -22,9 +22,6 @@ except: from dummy_thread import allocate_lock as _thread_allocate_lock -__author__ = "Brett Cannon" -__email__ = "brett(a)python.org" - __all__ = ['strptime'] def _getlang(): Modified: python/trunk/Lib/dummy_thread.py ============================================================================== --- python/trunk/Lib/dummy_thread.py (original) +++ python/trunk/Lib/dummy_thread.py Fri Jan 26 00:30:39 2007 @@ -11,11 +11,8 @@ import dummy_thread as thread """ -__author__ = "Brett Cannon" -__email__ = "brett(a)python.org" - -# Exports only things specified by thread documentation -# (skipping obsolete synonyms allocate(), start_new(), exit_thread()) +# Exports only things specified by thread documentation; +# skipping obsolete synonyms allocate(), start_new(), exit_thread(). __all__ = ['error', 'start_new_thread', 'exit', 'get_ident', 'allocate_lock', 'interrupt_main', 'LockType'] Modified: python/trunk/Lib/dummy_threading.py ============================================================================== --- python/trunk/Lib/dummy_threading.py (original) +++ python/trunk/Lib/dummy_threading.py Fri Jan 26 00:30:39 2007 @@ -5,11 +5,6 @@ directly imported it would have made all subsequent imports succeed regardless of whether ``thread`` was available which is not desired. -:Author: Brett Cannon -:Contact: brett(a)python.org - -XXX: Try to get rid of ``_dummy_threading``. - """ from sys import modules as sys_modules

1 0

r53569 - in python/branches/release25-maint: Lib/_strptime.py Lib/test/test_strptime.py Misc/NEWS
by brett.cannon Jan. 25, 2007

Jan. 25, 2007

Author: brett.cannon Date: Fri Jan 26 00:22:24 2007 New Revision: 53569 Modified: python/branches/release25-maint/Lib/_strptime.py python/branches/release25-maint/Lib/test/test_strptime.py python/branches/release25-maint/Misc/NEWS Log: Backport fix for bug #1643943. Modified: python/branches/release25-maint/Lib/_strptime.py ============================================================================== --- python/branches/release25-maint/Lib/_strptime.py (original) +++ python/branches/release25-maint/Lib/_strptime.py Fri Jan 26 00:22:24 2007 @@ -273,6 +273,27 @@ _CACHE_MAX_SIZE = 5 # Max number of regexes stored in _regex_cache _regex_cache = {} +def _calc_julian_from_U_or_W(year, week_of_year, day_of_week, week_starts_Mon): + """Calculate the Julian day based on the year, week of the year, and day of + the week, with week_start_day representing whether the week of the year + assumes the week starts on Sunday or Monday (6 or 0).""" + first_weekday = datetime_date(year, 1, 1).weekday() + # If we are dealing with the %U directive (week starts on Sunday), it's + # easier to just shift the view to Sunday being the first day of the + # week. + if not week_starts_Mon: + first_weekday = (first_weekday + 1) % 7 + day_of_week = (day_of_week + 1) % 7 + # Need to watch out for a week 0 (when the first day of the year is not + # the same as that specified by %U or %W). + week_0_length = (7 - first_weekday) % 7 + if week_of_year == 0: + return 1 + day_of_week - first_weekday + else: + days_to_week = week_0_length + (7 * (week_of_year - 1)) + return 1 + days_to_week + day_of_week + + def strptime(data_string, format="%a %b %d %H:%M:%S %Y"): """Return a time struct based on the input string and the format string.""" global _TimeRE_cache, _regex_cache @@ -385,10 +406,10 @@ elif group_key in ('U', 'W'): week_of_year = int(found_dict[group_key]) if group_key == 'U': - # U starts week on Sunday + # U starts week on Sunday. week_of_year_start = 6 else: - # W starts week on Monday + # 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 @@ -406,42 +427,20 @@ 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 + # out the Julian day of the year. if julian == -1 and week_of_year != -1 and weekday != -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 - # 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 - # If a year starts and ends on a Monday but a week is specified to - # start on a Sunday we need to up the week to counter-balance the fact - # that with %W that first Monday starts week 1 while with %U that is - # week 0 and thus shifts everything by a week - if weekday == 0 and first_weekday == 0 and week_of_year_start == 6: - week_of_year += 1 - # 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 week_of_year == 0: - julian = 1 + weekday - first_weekday - else: - days_to_week = preceeding_days + (7 * (week_of_year - 1)) - julian = 1 + days_to_week + weekday + week_starts_Mon = True if week_of_year_start == 0 else False + julian = _calc_julian_from_U_or_W(year, week_of_year, weekday, + week_starts_Mon) # Cannot pre-calculate datetime_date() since can change in Julian - #calculation and thus could have different value for the day of the week - #calculation + # calculation and thus could have different value for the day of the week + # calculation. if julian == -1: # Need to add 1 to result since first day of the year is 1, not 0. julian = datetime_date(year, month, day).toordinal() - \ datetime_date(year, 1, 1).toordinal() + 1 else: # Assume that if they bothered to include Julian day it will - #be accurate + # be accurate. datetime_result = datetime_date.fromordinal((julian - 1) + datetime_date(year, 1, 1).toordinal()) year = datetime_result.year month = datetime_result.month Modified: python/branches/release25-maint/Lib/test/test_strptime.py ============================================================================== --- python/branches/release25-maint/Lib/test/test_strptime.py (original) +++ python/branches/release25-maint/Lib/test/test_strptime.py Fri Jan 26 00:22:24 2007 @@ -463,6 +463,10 @@ "of the year") test_helper((1917, 12, 31), "Dec 31 on Monday with year starting and " "ending on Monday") + test_helper((2007, 01, 07), "First Sunday of 2007") + test_helper((2007, 01, 14), "Second Sunday of 2007") + test_helper((2006, 12, 31), "Last Sunday of 2006") + test_helper((2006, 12, 24), "Second to last Sunday of 2006") class CacheTests(unittest.TestCase): Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Fri Jan 26 00:22:24 2007 @@ -154,6 +154,8 @@ Library ------- +- Bug #1643943: Fix %U handling for time.strptime. + - Patch #1643874: memory leak in ctypes fixed. - Bug #1598181: Avoid O(N**2) bottleneck in subprocess communicate().

1 0

r53232 - in python/trunk: Doc/lib/libtest.tex Lib/test/test_support.py Misc/NEWS
by brett.cannon Jan. 25, 2007

Jan. 25, 2007

Author: brett.cannon Date: Thu Jan 4 01:23:49 2007 New Revision: 53232 Modified: python/trunk/Doc/lib/libtest.tex python/trunk/Lib/test/test_support.py python/trunk/Misc/NEWS Log: Add EnvironmentVarGuard to test.test_support. Provides a context manager to temporarily set or unset environment variables. Modified: python/trunk/Doc/lib/libtest.tex ============================================================================== --- python/trunk/Doc/lib/libtest.tex (original) +++ python/trunk/Doc/lib/libtest.tex Thu Jan 4 01:23:49 2007 @@ -281,4 +281,22 @@ The optional argument \var{testclass} accepts one of the test classes in the suite so as to print out more detailed information on where the testing suite originated from. + +The \module{test.test_support} module defines the following classes: + +\begin{classdesc}{EnvironmentVarGuard}{} +Class used to temporarily set or unset environment variables. Instances can be +used as a context manager. +\versionadded{2.6} +\end{classdesc} + +\begin{methoddesc}{set}{envvar, value} +Temporarily set the environment variable \code{envvar} to the value of +\code{value}. +\end{methoddesc} + +\begin{methoddesc}{unset}{envvar} +Temporarily unset the environment variable \code{envvar}. +\end{methoddesc} + \end{funcdesc} Modified: python/trunk/Lib/test/test_support.py ============================================================================== --- python/trunk/Lib/test/test_support.py (original) +++ python/trunk/Lib/test/test_support.py Thu Jan 4 01:23:49 2007 @@ -279,7 +279,39 @@ yield finally: warnings.filters = original_filters - + +class EnvironmentVarGuard(object): + + """Class to help protect the environment variable properly. Can be used as + a context manager.""" + + def __init__(self): + from os import environ + self._environ = environ + self._unset = set() + self._reset = dict() + + def set(self, envvar, value): + if envvar not in self._environ: + self._unset.add(envvar) + else: + self._reset[envvar] = self._environ[envvar] + self._environ[envvar] = value + + def unset(self, envvar): + if envvar in self._environ: + self._reset[envvar] = self._environ[envvar] + del self._environ[envvar] + + def __enter__(self): + return self + + def __exit__(self, *ignore_exc): + for envvar, value in self._reset.iteritems(): + self._environ[envvar] = value + for unset in self._unset: + del self._environ[unset] + #======================================================================= # Decorator for running a function in a different locale, correctly resetting Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu Jan 4 01:23:49 2007 @@ -323,6 +323,10 @@ Tests ----- +- Added test.test_support.EnvironmentVarGuard. It's a class that provides a + context manager so that one can temporarily set or unset environment + variables. + - Added guard_warnings_filter to test.test_support. It returns a context manager that protects the 'warnings' module's filter from being mutated once the context has been exited.

3 2

r53564 - in python/trunk: Lib/_strptime.py Lib/test/test_strptime.py Misc/NEWS
by brett.cannon Jan. 25, 2007

Jan. 25, 2007

Author: brett.cannon Date: Thu Jan 25 21:22:02 2007 New Revision: 53564 Modified: python/trunk/Lib/_strptime.py python/trunk/Lib/test/test_strptime.py python/trunk/Misc/NEWS Log: Fix time.strptime's %U support. Basically rewrote the algorithm to be more generic so that one only has to shift certain values based on whether the week was specified to start on Monday or Sunday. Cut out a lot of edge case code compared to the previous version. Also broke algorithm out into its own function (that is private to the module). Fixes bug #1643943 (thanks Biran Nahas for the report). Modified: python/trunk/Lib/_strptime.py ============================================================================== --- python/trunk/Lib/_strptime.py (original) +++ python/trunk/Lib/_strptime.py Thu Jan 25 21:22:02 2007 @@ -273,6 +273,27 @@ _CACHE_MAX_SIZE = 5 # Max number of regexes stored in _regex_cache _regex_cache = {} +def _calc_julian_from_U_or_W(year, week_of_year, day_of_week, week_starts_Mon): + """Calculate the Julian day based on the year, week of the year, and day of + the week, with week_start_day representing whether the week of the year + assumes the week starts on Sunday or Monday (6 or 0).""" + first_weekday = datetime_date(year, 1, 1).weekday() + # If we are dealing with the %U directive (week starts on Sunday), it's + # easier to just shift the view to Sunday being the first day of the + # week. + if not week_starts_Mon: + first_weekday = (first_weekday + 1) % 7 + day_of_week = (day_of_week + 1) % 7 + # Need to watch out for a week 0 (when the first day of the year is not + # the same as that specified by %U or %W). + week_0_length = (7 - first_weekday) % 7 + if week_of_year == 0: + return 1 + day_of_week - first_weekday + else: + days_to_week = week_0_length + (7 * (week_of_year - 1)) + return 1 + days_to_week + day_of_week + + def strptime(data_string, format="%a %b %d %H:%M:%S %Y"): """Return a time struct based on the input string and the format string.""" global _TimeRE_cache, _regex_cache @@ -385,10 +406,10 @@ elif group_key in ('U', 'W'): week_of_year = int(found_dict[group_key]) if group_key == 'U': - # U starts week on Sunday + # U starts week on Sunday. week_of_year_start = 6 else: - # W starts week on Monday + # 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 @@ -406,42 +427,20 @@ 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 + # out the Julian day of the year. if julian == -1 and week_of_year != -1 and weekday != -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 - # 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 - # If a year starts and ends on a Monday but a week is specified to - # start on a Sunday we need to up the week to counter-balance the fact - # that with %W that first Monday starts week 1 while with %U that is - # week 0 and thus shifts everything by a week - if weekday == 0 and first_weekday == 0 and week_of_year_start == 6: - week_of_year += 1 - # 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 week_of_year == 0: - julian = 1 + weekday - first_weekday - else: - days_to_week = preceeding_days + (7 * (week_of_year - 1)) - julian = 1 + days_to_week + weekday + week_starts_Mon = True if week_of_year_start == 0 else False + julian = _calc_julian_from_U_or_W(year, week_of_year, weekday, + week_starts_Mon) # Cannot pre-calculate datetime_date() since can change in Julian - #calculation and thus could have different value for the day of the week - #calculation + # calculation and thus could have different value for the day of the week + # calculation. if julian == -1: # Need to add 1 to result since first day of the year is 1, not 0. julian = datetime_date(year, month, day).toordinal() - \ datetime_date(year, 1, 1).toordinal() + 1 else: # Assume that if they bothered to include Julian day it will - #be accurate + # be accurate. datetime_result = datetime_date.fromordinal((julian - 1) + datetime_date(year, 1, 1).toordinal()) year = datetime_result.year month = datetime_result.month Modified: python/trunk/Lib/test/test_strptime.py ============================================================================== --- python/trunk/Lib/test/test_strptime.py (original) +++ python/trunk/Lib/test/test_strptime.py Thu Jan 25 21:22:02 2007 @@ -463,6 +463,10 @@ "of the year") test_helper((1917, 12, 31), "Dec 31 on Monday with year starting and " "ending on Monday") + test_helper((2007, 01, 07), "First Sunday of 2007") + test_helper((2007, 01, 14), "Second Sunday of 2007") + test_helper((2006, 12, 31), "Last Sunday of 2006") + test_helper((2006, 12, 24), "Second to last Sunday of 2006") class CacheTests(unittest.TestCase): Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu Jan 25 21:22:02 2007 @@ -123,6 +123,8 @@ Library ------- +- Bug #1643943: Fix time.strptime's support for the %U directive. + - Patch #1643874: memory leak in ctypes fixed. - Patch #1627441: close sockets properly in urllib2. @@ -130,12 +132,12 @@ - Bug #494589: make ntpath.expandvars behave according to its docstring. - Changed platform module API python_version_tuple() to actually - return a tuple (it used to return a list) + return a tuple (it used to return a list). - Added new platform module APIs python_branch(), python_revision(), - python_implementation() and linux_distribution() + python_implementation() and linux_distribution(). -- Added support for IronPython and Jython to the platform module +- Added support for IronPython and Jython to the platform module. - The sets module has been deprecated. Use the built-in set/frozenset types instead.

1 0

r53563 - python/trunk/Doc/whatsnew/whatsnew26.tex
by andrew.kuchling Jan. 25, 2007

Jan. 25, 2007

Author: andrew.kuchling Date: Thu Jan 25 21:02:13 2007 New Revision: 53563 Modified: python/trunk/Doc/whatsnew/whatsnew26.tex Log: Add item Modified: python/trunk/Doc/whatsnew/whatsnew26.tex ============================================================================== --- python/trunk/Doc/whatsnew/whatsnew26.tex (original) +++ python/trunk/Doc/whatsnew/whatsnew26.tex Thu Jan 25 21:02:13 2007 @@ -72,6 +72,12 @@ This class supports an interface identical to the existing \class{SMTP} class. (Contributed by Monty Taylor.) +\item The \module{test.test_support} module now contains a +\function{EnvironmentVarGuard} context manager that +supports temporarily changing environment variables and +automatically restores them to their old values. +(Contributed by Brett Cannon.) + \end{itemize}

1 0

r53558 - in python/branches/release25-maint: Misc/NEWS Modules/_ctypes Modules/_ctypes/cfield.c
by thomas.heller Jan. 25, 2007

Jan. 25, 2007

Author: thomas.heller Date: Thu Jan 25 20:19:35 2007 New Revision: 53558 Modified: python/branches/release25-maint/Misc/NEWS python/branches/release25-maint/Modules/_ctypes/ (props changed) python/branches/release25-maint/Modules/_ctypes/cfield.c Log: Merged revisions 53556 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk/Modules/_ctypes ........ r53556 | thomas.heller | 2007-01-25 19:34:14 +0100 (Do, 25 Jan 2007) | 3 lines Fix for #1643874: When calling SysAllocString, create a PyCObject which will eventually call SysFreeString to free the BSTR resource. ........ Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Thu Jan 25 20:19:35 2007 @@ -154,6 +154,8 @@ Library ------- +- Patch #1643874: memory leak in ctypes fixed. + - Bug #1598181: Avoid O(N**2) bottleneck in subprocess communicate(). - Patch #1627441: close sockets properly in urllib2. Modified: python/branches/release25-maint/Modules/_ctypes/cfield.c ============================================================================== --- python/branches/release25-maint/Modules/_ctypes/cfield.c (original) +++ python/branches/release25-maint/Modules/_ctypes/cfield.c Thu Jan 25 20:19:35 2007 @@ -1424,10 +1424,19 @@ #endif #ifdef MS_WIN32 +/* We cannot use SysFreeString as the PyCObject_FromVoidPtr + because of different calling convention +*/ +static void _my_SysFreeString(void *p) +{ + SysFreeString((BSTR)p); +} + static PyObject * BSTR_set(void *ptr, PyObject *value, unsigned size) { BSTR bstr; + PyObject *result; /* convert value into a PyUnicodeObject or NULL */ if (Py_None == value) { @@ -1455,15 +1464,19 @@ } else bstr = NULL; - /* free the previous contents, if any */ - if (*(BSTR *)ptr) - SysFreeString(*(BSTR *)ptr); - - /* and store it */ - *(BSTR *)ptr = bstr; + if (bstr) { + result = PyCObject_FromVoidPtr((void *)bstr, _my_SysFreeString); + if (result == NULL) { + SysFreeString(bstr); + return NULL; + } + } else { + result = Py_None; + Py_INCREF(result); + } - /* We don't need to keep any other object */ - _RET(value); + *(BSTR *)ptr = bstr; + return result; }

1 0

r53556 - in python/trunk: Misc/NEWS Modules/_ctypes/cfield.c
by thomas.heller Jan. 25, 2007

Jan. 25, 2007

Author: thomas.heller Date: Thu Jan 25 19:34:14 2007 New Revision: 53556 Modified: python/trunk/Misc/NEWS python/trunk/Modules/_ctypes/cfield.c Log: Fix for #1643874: When calling SysAllocString, create a PyCObject which will eventually call SysFreeString to free the BSTR resource. Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu Jan 25 19:34:14 2007 @@ -123,6 +123,8 @@ Library ------- +- Patch #1643874: memory leak in ctypes fixed. + - Patch #1627441: close sockets properly in urllib2. - Bug #494589: make ntpath.expandvars behave according to its docstring. Modified: python/trunk/Modules/_ctypes/cfield.c ============================================================================== --- python/trunk/Modules/_ctypes/cfield.c (original) +++ python/trunk/Modules/_ctypes/cfield.c Thu Jan 25 19:34:14 2007 @@ -1432,10 +1432,19 @@ #endif #ifdef MS_WIN32 +/* We cannot use SysFreeString as the PyCObject_FromVoidPtr + because of different calling convention +*/ +static void _my_SysFreeString(void *p) +{ + SysFreeString((BSTR)p); +} + static PyObject * BSTR_set(void *ptr, PyObject *value, unsigned size) { BSTR bstr; + PyObject *result; /* convert value into a PyUnicodeObject or NULL */ if (Py_None == value) { @@ -1463,15 +1472,19 @@ } else bstr = NULL; - /* free the previous contents, if any */ - if (*(BSTR *)ptr) - SysFreeString(*(BSTR *)ptr); - - /* and store it */ - *(BSTR *)ptr = bstr; + if (bstr) { + result = PyCObject_FromVoidPtr((void *)bstr, _my_SysFreeString); + if (result == NULL) { + SysFreeString(bstr); + return NULL; + } + } else { + result = Py_None; + Py_INCREF(result); + } - /* We don't need to keep any other object */ - _RET(value); + *(BSTR *)ptr = bstr; + return result; }

1 0

r53548 - in sandbox/branches/setuptools-0.6: launcher.c setuptools.txt setuptools/cli.exe setuptools/gui.exe setuptools/tests/win_script_wrapper.txt
by phillip.eby Jan. 24, 2007

Jan. 24, 2007

Author: phillip.eby Date: Wed Jan 24 22:00:55 2007 New Revision: 53548 Modified: sandbox/branches/setuptools-0.6/launcher.c sandbox/branches/setuptools-0.6/setuptools.txt sandbox/branches/setuptools-0.6/setuptools/cli.exe sandbox/branches/setuptools-0.6/setuptools/gui.exe sandbox/branches/setuptools-0.6/setuptools/tests/win_script_wrapper.txt Log: Fix ``#!`` parsing problems in Windows ``.exe`` script wrappers, when there was whitespace inside a quoted argument or at the end of the ``#!`` line (backport from trunk) Modified: sandbox/branches/setuptools-0.6/launcher.c ============================================================================== --- sandbox/branches/setuptools-0.6/launcher.c (original) +++ sandbox/branches/setuptools-0.6/launcher.c Wed Jan 24 22:00:55 2007 @@ -129,6 +129,7 @@ char *output = cmdline; char c; int nb = 0; + int iq = 0; *argc = 0; result[0] = output; @@ -136,19 +137,20 @@ do { c = *cmdline++; - if (!c || isspace(c)) { + if (!c || (isspace(c) && !iq)) { while (nb) {*output++ = '\\'; nb--; } *output++ = 0; result[++*argc] = output; if (!c) return result; while (isspace(*cmdline)) cmdline++; /* skip leading spaces */ + if (!*cmdline) return result; /* avoid empty arg if trailing ws */ continue; } if (c == '\\') ++nb; /* count \'s */ else { if (c == '"') { - if (!(nb & 1)) c = 0; /* skip " unless odd # of \ */ + if (!(nb & 1)) { iq = !iq; c = 0; } /* skip " unless odd # of \ */ nb = nb >> 1; /* cut \'s in half */ } while (nb) {*output++ = '\\'; nb--; } @@ -160,8 +162,6 @@ - - int run(int argc, char **argv, int is_gui) { char python[256]; /* python executable's filename*/ Modified: sandbox/branches/setuptools-0.6/setuptools.txt ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools.txt (original) +++ sandbox/branches/setuptools-0.6/setuptools.txt Wed Jan 24 22:00:55 2007 @@ -2606,6 +2606,10 @@ * Fix "eggsecutables" (such as setuptools' own egg) only being runnable with bash-compatible shells. + * Fix ``#!`` parsing problems in Windows ``.exe`` script wrappers, when there + was whitespace inside a quoted argument or at the end of the ``#!`` line + (a regression introduced in 0.6c4). + 0.6c5 * Fix uploaded ``bdist_rpm`` packages being described as ``bdist_egg`` packages under Python versions less than 2.5. Modified: sandbox/branches/setuptools-0.6/setuptools/cli.exe ============================================================================== Binary files. No diff available. Modified: sandbox/branches/setuptools-0.6/setuptools/gui.exe ============================================================================== Binary files. No diff available. Modified: sandbox/branches/setuptools-0.6/setuptools/tests/win_script_wrapper.txt ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/tests/win_script_wrapper.txt (original) +++ sandbox/branches/setuptools-0.6/setuptools/tests/win_script_wrapper.txt Wed Jan 24 22:00:55 2007 @@ -15,6 +15,7 @@ Let's create a simple script, foo-script.py: >>> import os, sys, tempfile + >>> from setuptools.command.easy_install import nt_quote_arg >>> sample_directory = tempfile.mkdtemp() >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write( ... """#!%(python_exe)s @@ -25,7 +26,7 @@ ... print input ... if __debug__: ... print 'non-optimized' - ... """ % dict(python_exe=sys.executable)) + ... """ % dict(python_exe=nt_quote_arg(sys.executable))) Note that the script starts with a Unix-style '#!' line saying which Python executable to run. The wrapper will use this to find the @@ -46,8 +47,8 @@ the wrapper: >>> import os - >>> input, output = os.popen4(os.path.join(sample_directory, 'foo.exe') - ... + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b') + >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'foo.exe')) + ... + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"') >>> input.write('hello\nworld\n') >>> input.close() >>> print output.read(), @@ -86,9 +87,9 @@ ... if __debug__: ... print 'non-optimized' ... sys.ps1 = '---' - ... """ % dict(python_exe=sys.executable)) + ... """ % dict(python_exe=nt_quote_arg(sys.executable))) - >>> input, output = os.popen4(os.path.join(sample_directory, 'foo.exe')) + >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe'))) >>> input.close() >>> print output.read(), \foo-script.py

1 0

r53547 - in sandbox/trunk/setuptools: launcher.c setuptools/cli.exe setuptools/gui.exe setuptools/tests/win_script_wrapper.txt
by phillip.eby Jan. 24, 2007

Jan. 24, 2007

Author: phillip.eby Date: Wed Jan 24 21:57:26 2007 New Revision: 53547 Modified: sandbox/trunk/setuptools/launcher.c sandbox/trunk/setuptools/setuptools/cli.exe sandbox/trunk/setuptools/setuptools/gui.exe sandbox/trunk/setuptools/setuptools/tests/win_script_wrapper.txt Log: Fix #! parsing problems w/whitespace in quoted strings or at the end of the #! line. Modified: sandbox/trunk/setuptools/launcher.c ============================================================================== --- sandbox/trunk/setuptools/launcher.c (original) +++ sandbox/trunk/setuptools/launcher.c Wed Jan 24 21:57:26 2007 @@ -129,6 +129,7 @@ char *output = cmdline; char c; int nb = 0; + int iq = 0; *argc = 0; result[0] = output; @@ -136,19 +137,20 @@ do { c = *cmdline++; - if (!c || isspace(c)) { + if (!c || (isspace(c) && !iq)) { while (nb) {*output++ = '\\'; nb--; } *output++ = 0; result[++*argc] = output; if (!c) return result; while (isspace(*cmdline)) cmdline++; /* skip leading spaces */ + if (!*cmdline) return result; /* avoid empty arg if trailing ws */ continue; } if (c == '\\') ++nb; /* count \'s */ else { if (c == '"') { - if (!(nb & 1)) c = 0; /* skip " unless odd # of \ */ + if (!(nb & 1)) { iq = !iq; c = 0; } /* skip " unless odd # of \ */ nb = nb >> 1; /* cut \'s in half */ } while (nb) {*output++ = '\\'; nb--; } @@ -160,8 +162,6 @@ - - int run(int argc, char **argv, int is_gui) { char python[256]; /* python executable's filename*/ Modified: sandbox/trunk/setuptools/setuptools/cli.exe ============================================================================== Binary files. No diff available. Modified: sandbox/trunk/setuptools/setuptools/gui.exe ============================================================================== Binary files. No diff available. Modified: sandbox/trunk/setuptools/setuptools/tests/win_script_wrapper.txt ============================================================================== --- sandbox/trunk/setuptools/setuptools/tests/win_script_wrapper.txt (original) +++ sandbox/trunk/setuptools/setuptools/tests/win_script_wrapper.txt Wed Jan 24 21:57:26 2007 @@ -15,6 +15,7 @@ Let's create a simple script, foo-script.py: >>> import os, sys, tempfile + >>> from setuptools.command.easy_install import nt_quote_arg >>> sample_directory = tempfile.mkdtemp() >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write( ... """#!%(python_exe)s @@ -25,7 +26,7 @@ ... print input ... if __debug__: ... print 'non-optimized' - ... """ % dict(python_exe=sys.executable)) + ... """ % dict(python_exe=nt_quote_arg(sys.executable))) Note that the script starts with a Unix-style '#!' line saying which Python executable to run. The wrapper will use this to find the @@ -46,8 +47,8 @@ the wrapper: >>> import os - >>> input, output = os.popen4(os.path.join(sample_directory, 'foo.exe') - ... + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b') + >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'foo.exe')) + ... + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"') >>> input.write('hello\nworld\n') >>> input.close() >>> print output.read(), @@ -86,9 +87,9 @@ ... if __debug__: ... print 'non-optimized' ... sys.ps1 = '---' - ... """ % dict(python_exe=sys.executable)) + ... """ % dict(python_exe=nt_quote_arg(sys.executable))) - >>> input, output = os.popen4(os.path.join(sample_directory, 'foo.exe')) + >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe'))) >>> input.close() >>> print output.read(), \foo-script.py

1 0

r53546 - python/branches/release25-maint/Doc/lib/libmailbox.tex
by andrew.kuchling Jan. 24, 2007

Jan. 24, 2007

Author: andrew.kuchling Date: Wed Jan 24 21:08:13 2007 New Revision: 53546 Modified: python/branches/release25-maint/Doc/lib/libmailbox.tex Log: Strengthen warning about using lock() Modified: python/branches/release25-maint/Doc/lib/libmailbox.tex ============================================================================== --- python/branches/release25-maint/Doc/lib/libmailbox.tex (original) +++ python/branches/release25-maint/Doc/lib/libmailbox.tex Wed Jan 24 21:08:13 2007 @@ -58,14 +58,18 @@ \exception{KeyError} exception if the corresponding message is subsequently removed. -Be very cautious when modifying mailboxes that might also be changed -by some other process. The safest mailbox format to use for such -tasks is Maildir; try to avoid using single-file formats such as mbox -for concurrent writing. If you're modifying a mailbox, no matter what -the format, you must lock it by calling the \method{lock()} and -\method{unlock()} methods before making any changes. Failing to lock -the mailbox runs the risk of losing data if some other process makes -changes to the mailbox while your Python code is running. +\begin{notice}[warning] +Be very cautious when modifying mailboxes that might be +simultaneously changed by some other process. The safest mailbox +format to use for such tasks is Maildir; try to avoid using +single-file formats such as mbox for concurrent writing. If you're +modifying a mailbox, you +\emph{must} lock it by calling the \method{lock()} and +\method{unlock()} methods \emph{before} reading any messages in the file +or making any changes by adding or deleting a message. Failing to +lock the mailbox runs the risk of losing messages or corrupting the entire +mailbox. +\end{notice} \class{Mailbox} instances have the following methods:

1 0