Mailman 3 September 2008 - Python-checkins

r66100 - python/trunk/Lib/msilib/__init__.py
by hirokazu.yamamoto 01 Sep '08

01 Sep '08

Author: hirokazu.yamamoto Date: Mon Sep 1 16:24:04 2008 New Revision: 66100 Log: Issue #3732: Backported r53335 to supress deprecation warning. Reviewed by Benjamin Peterson. Modified: python/trunk/Lib/msilib/__init__.py Modified: python/trunk/Lib/msilib/__init__.py ============================================================================== --- python/trunk/Lib/msilib/__init__.py (original) +++ python/trunk/Lib/msilib/__init__.py Mon Sep 1 16:24:04 2008 @@ -2,7 +2,7 @@ # Copyright (C) 2005 Martin v. L�wis # Licensed to PSF under a Contributor Agreement. from _msi import * -import sets, os, string, re +import os, string, re Win64=0 @@ -184,7 +184,7 @@ def __init__(self, name): self.name = name self.files = [] - self.filenames = sets.Set() + self.filenames = set() self.index = 0 def gen_id(self, file): @@ -215,7 +215,7 @@ os.unlink(filename) db.Commit() -_directories = sets.Set() +_directories = set() class Directory: def __init__(self, db, cab, basedir, physical, _logical, default, componentflags=None): """Create a new directory in the Directory table. There is a current component @@ -239,8 +239,8 @@ self.physical = physical self.logical = logical self.component = None - self.short_names = sets.Set() - self.ids = sets.Set() + self.short_names = set() + self.ids = set() self.keyfiles = {} self.componentflags = componentflags if basedir:

1 0

r66099 - in python/trunk: Misc/NEWS Python/import.c
by benjamin.peterson 01 Sep '08

01 Sep '08

Author: benjamin.peterson Date: Mon Sep 1 16:18:30 2008 New Revision: 66099 Log: Fix compilation when --without-threads is given #3683 Reviewer: Georg Brandl, Benjamin Peterson Modified: python/trunk/Misc/NEWS python/trunk/Python/import.c Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Sep 1 16:18:30 2008 @@ -12,6 +12,8 @@ Core and Builtins ----------------- +- Issue #3683: Fix compilation when --without-threads is given. + - Issue #3668: Fix a memory leak with the "s*" argument parser in PyArg_ParseTuple and friends, which occurred when the argument for "s*" was correctly parsed but parsing of subsequent arguments failed. @@ -52,8 +54,8 @@ - Fixed two format strings in the _collections module. -- #3703 _fileio.FileIO gave unhelpful error message when trying to open a - directory. +- Issue #3703: _fileio.FileIO gave unhelpful error message when trying to open a + directory. Extension Modules ----------------- Modified: python/trunk/Python/import.c ============================================================================== --- python/trunk/Python/import.c (original) +++ python/trunk/Python/import.c Mon Sep 1 16:18:30 2008 @@ -2029,7 +2029,7 @@ else { PyErr_Clear(); } - +#ifdef WITH_THREAD /* check the import lock * me might be -1 but I ignore the error here, the lock function * takes care of the problem */ @@ -2045,6 +2045,9 @@ name); return NULL; } +#else + return PyImport_ImportModule(name); +#endif } /* Forward declarations for helper routines */

1 0

r66098 - python/trunk/Doc/library/codecs.rst
by georg.brandl 01 Sep '08

01 Sep '08

Author: georg.brandl Date: Mon Sep 1 16:15:55 2008 New Revision: 66098 Log: #3749: fix c'n'p errors. Modified: python/trunk/Doc/library/codecs.rst Modified: python/trunk/Doc/library/codecs.rst ============================================================================== --- python/trunk/Doc/library/codecs.rst (original) +++ python/trunk/Doc/library/codecs.rst Mon Sep 1 16:15:55 2008 @@ -51,13 +51,13 @@ Codec Interface). The functions/methods are expected to work in a stateless mode. - *incrementalencoder* and *incrementalencoder*: These have to be factory + *incrementalencoder* and *incrementaldecoder*: These have to be factory functions providing the following interface: ``factory(errors='strict')`` The factory functions must return objects providing the interfaces defined by - the base classes :class:`IncrementalEncoder` and :class:`IncrementalEncoder`, + the base classes :class:`IncrementalEncoder` and :class:`IncrementalDecoder`, respectively. Incremental codecs can maintain state. *streamreader* and *streamwriter*: These have to be factory functions providing @@ -477,7 +477,7 @@ The *errors* argument will be assigned to an attribute of the same name. Assigning to this attribute makes it possible to switch between different error - handling strategies during the lifetime of the :class:`IncrementalEncoder` + handling strategies during the lifetime of the :class:`IncrementalDecoder` object. The set of allowed values for the *errors* argument can be extended with

1 0

r66097 - in python/trunk: Lib/test/test_fileio.py Misc/NEWS Modules/_fileio.c
by benjamin.peterson 01 Sep '08

01 Sep '08

Author: benjamin.peterson Date: Mon Sep 1 16:13:43 2008 New Revision: 66097 Log: #3703 unhelpful _fileio.FileIO error message when trying to open a directory Reviewer: Gregory P. Smith Modified: python/trunk/Lib/test/test_fileio.py python/trunk/Misc/NEWS python/trunk/Modules/_fileio.c Modified: python/trunk/Lib/test/test_fileio.py ============================================================================== --- python/trunk/Lib/test/test_fileio.py (original) +++ python/trunk/Lib/test/test_fileio.py Mon Sep 1 16:13:43 2008 @@ -101,6 +101,17 @@ # should raise on closed file self.assertRaises(ValueError, method) + def testOpendir(self): + # Issue 3703: opening a directory should fill the errno + # Windows always returns "[Errno 13]: Permission denied + # Unix calls dircheck() and returns "[Errno 21]: Is a directory" + try: + _fileio._FileIO('.', 'r') + except IOError as e: + self.assertNotEqual(e.errno, 0) + else: + self.fail("Should have raised IOError") + class OtherFileTests(unittest.TestCase): Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Sep 1 16:13:43 2008 @@ -52,6 +52,9 @@ - Fixed two format strings in the _collections module. +- #3703 _fileio.FileIO gave unhelpful error message when trying to open a + directory. + Extension Modules ----------------- Modified: python/trunk/Modules/_fileio.c ============================================================================== --- python/trunk/Modules/_fileio.c (original) +++ python/trunk/Modules/_fileio.c Mon Sep 1 16:13:43 2008 @@ -262,7 +262,7 @@ #endif self->fd = open(name, flags, 0666); Py_END_ALLOW_THREADS - if (self->fd < 0 || dircheck(self) < 0) { + if (self->fd < 0) { #ifdef MS_WINDOWS PyErr_SetFromErrnoWithUnicodeFilename(PyExc_IOError, widename); #else @@ -270,6 +270,8 @@ #endif goto error; } + if(dircheck(self) < 0) + goto error; } goto done;

1 0