Mailman 3 February 2009 - Python-checkins

r70038 - python/branches/io-c/Lib/test/test_io.py
by antoine.pitrou Feb. 27, 2009

Feb. 27, 2009

Author: antoine.pitrou Date: Sat Feb 28 00:05:23 2009 New Revision: 70038 Log: Make the buffer allocation overflow tests specific to the C implementation, since the Python implementation resizes its buffers when needed rather than allocating them up front. Modified: python/branches/io-c/Lib/test/test_io.py Modified: python/branches/io-c/Lib/test/test_io.py ============================================================================== --- python/branches/io-c/Lib/test/test_io.py (original) +++ python/branches/io-c/Lib/test/test_io.py Sat Feb 28 00:05:23 2009 @@ -602,11 +602,6 @@ self.assertRaises(ValueError, bufio.__init__, rawio, buffer_size=0) self.assertRaises(ValueError, bufio.__init__, rawio, buffer_size=-16) self.assertRaises(ValueError, bufio.__init__, rawio, buffer_size=-1) - if sys.maxsize > 0x7FFFFFFF: - # The allocation can succeed on 32-bit builds, e.g. with more - # than 2GB RAM and a 64-bit kernel. - self.assertRaises((OverflowError, MemoryError, ValueError), - bufio.__init__, rawio, sys.maxsize) rawio = self.MockRawIO([b"abc"]) bufio.__init__(rawio) self.assertEquals(b"abc", bufio.read()) @@ -744,6 +739,16 @@ class CBufferedReaderTest(BufferedReaderTest): tp = io.BufferedReader + def testConstructor(self): + BufferedReaderTest.testConstructor(self) + # The allocation can succeed on 32-bit builds, e.g. with more + # than 2GB RAM and a 64-bit kernel. + if sys.maxsize > 0x7FFFFFFF: + rawio = self.MockRawIO() + bufio = self.tp(rawio) + self.assertRaises((OverflowError, MemoryError, ValueError), + bufio.__init__, rawio, sys.maxsize) + def test_initialization(self): rawio = self.MockRawIO([b"abc"]) bufio = self.tp(rawio) @@ -790,11 +795,6 @@ self.assertRaises(ValueError, bufio.__init__, rawio, buffer_size=0) self.assertRaises(ValueError, bufio.__init__, rawio, buffer_size=-16) self.assertRaises(ValueError, bufio.__init__, rawio, buffer_size=-1) - if sys.maxsize > 0x7FFFFFFF: - # The allocation can succeed on 32-bit builds, e.g. with more - # than 2GB RAM and a 64-bit kernel. - self.assertRaises((OverflowError, MemoryError, ValueError), - bufio.__init__, rawio, sys.maxsize) bufio.__init__(rawio) self.assertEquals(3, bufio.write(b"ghi")) bufio.flush() @@ -984,6 +984,16 @@ class CBufferedWriterTest(BufferedWriterTest): tp = io.BufferedWriter + def testConstructor(self): + BufferedWriterTest.testConstructor(self) + # The allocation can succeed on 32-bit builds, e.g. with more + # than 2GB RAM and a 64-bit kernel. + if sys.maxsize > 0x7FFFFFFF: + rawio = self.MockRawIO() + bufio = self.tp(rawio) + self.assertRaises((OverflowError, MemoryError, ValueError), + bufio.__init__, rawio, sys.maxsize) + def test_initialization(self): rawio = self.MockRawIO() bufio = self.tp(rawio) @@ -1160,6 +1170,16 @@ class CBufferedRandomTest(BufferedRandomTest): tp = io.BufferedRandom + def testConstructor(self): + BufferedRandomTest.testConstructor(self) + # The allocation can succeed on 32-bit builds, e.g. with more + # than 2GB RAM and a 64-bit kernel. + if sys.maxsize > 0x7FFFFFFF: + rawio = self.MockRawIO() + bufio = self.tp(rawio) + self.assertRaises((OverflowError, MemoryError, ValueError), + bufio.__init__, rawio, sys.maxsize) + def test_garbage_collection(self): CBufferedReaderTest.test_garbage_collection(self) CBufferedWriterTest.test_garbage_collection(self)

1 0

r70037 - python/branches/py3k
by benjamin.peterson Feb. 27, 2009

Feb. 27, 2009

Author: benjamin.peterson Date: Fri Feb 27 23:29:33 2009 New Revision: 70037 Log: Blocked revisions 70011,70016 via svnmerge ........ r70011 | brett.cannon | 2009-02-26 21:38:28 -0600 (Thu, 26 Feb 2009) | 5 lines Fix a bug where code was trying to index an int. Left over from the situation from using str.rpartition to str.rindex. Closes Issue5213. ........ r70016 | raymond.hettinger | 2009-02-27 02:09:47 -0600 (Fri, 27 Feb 2009) | 1 line Give mapping views a usable repr. ........ Modified: python/branches/py3k/ (props changed)

1 0

r70036 - peps/trunk/pep-0372.txt
by raymond.hettinger Feb. 27, 2009

Feb. 27, 2009

Author: raymond.hettinger Date: Fri Feb 27 23:01:24 2009 New Revision: 70036 Log: More small edits. Modified: peps/trunk/pep-0372.txt Modified: peps/trunk/pep-0372.txt ============================================================================== --- peps/trunk/pep-0372.txt (original) +++ peps/trunk/pep-0372.txt Fri Feb 27 23:01:24 2009 @@ -122,18 +122,12 @@ What happens if an existing key is reassigned? The key is not moved but assigned a new value in place. This is - consistent with existing implementations and allows subclasses to - change the behavior easily:: - - class moving_odict(collections.odict): - def __setitem__(self, key, value): - self.pop(key, None) - collections.odict.__setitem__(self, key, value) + consistent with existing implementations. What happens if keys appear multiple times in the list passed to the constructor? - The same as for regular dicts: The latter item overrides the + The same as for regular dicts -- the latter item overrides the former. This has the side-effect that the position of the first key is used because only the value is actually overwritten:: @@ -145,17 +139,17 @@ Is the ordered dict a dict subclass? Why? - Yes. Like ``defaultdict``, ``odict`` subclasses ``dict``. - Being a dict subclass confers speed upon methods that aren't overridden - like ``__getitem__`` and ``__len__``. Also, being a dict gives the - most utility with tools that were expecting regular dicts (like the - json module). + Yes. Like ``defaultdict``, an ordered dictionary `` subclasses ``dict``. + Being a dict subclass make some of the methods faster (like + ``__getitem__`` and ``__len__``). More importantly, being a dict + subclass lets ordered dictionaries be usable with tools like json that + insist on having dict inputs by testing isinstance(d, dict). Do any limitations arise from subclassing dict? Yes. Since the API for dicts is different in Py2.x and Py3.x, the - odict API must also be different (i.e. Py2.6 needs to override - iterkeys, itervalues, and iteritems). + odict API must also be different. So, the Py2.7 version will need + to override iterkeys, itervalues, and iteritems. Does ``odict.popitem()`` return a particular key/value pair? @@ -164,22 +158,21 @@ exhibited by traditional push/pop pairs. It is semantically equivalent to ``k=list(od)[-1]; v=od[k]; del od[k]; return (k,v)``. The actual implementation is more efficient and pops directly - off of a sorted list of keys. + from a sorted list of keys. Does odict support indexing, slicing, and whatnot? As a matter of fact, ``odict`` does not implement the ``Sequence`` interface. Rather, it is a ``MutableMapping`` that remembers the order of key insertion. The only sequence-like addition is - automatic support for ``reversed``. + support for ``reversed``. Does odict support alternate sort orders such as alphabetical? No. Those wanting different sort orders really need to be using another technique. The odict is all about recording insertion order. If any other order is of interest, then another structure (like an in-memory - dbm) is likely a better fit. It would be a mistake to try to be all - things to all users. + dbm) is likely a better fit. How well does odict work with the json module, PyYAML, and ConfigParser? @@ -213,7 +206,7 @@ >>> yaml.load(ytext) OrderedDict({'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5}) - For the ConfigParser module, round-tripping is problem free. Custom + For the ConfigParser module, round-tripping is also problem free. Custom dicts were added in Py2.6 specifically to support ordered dictionaries:: >>> config = ConfigParser(dict_type=OrderedDict) @@ -224,21 +217,23 @@ How does odict handle equality testing? Being a dict, one might expect equality tests to not care about order. For - an odict to dict comparison, this would be a necessity and it's probably + an odict-to-dict comparison, this would be a necessity and it's probably not wise to silently switch comparison modes based on the input types. Also, some third-party tools that expect dict inputs may also expect the comparison to not care about order. Accordingly, we decided to punt and let the usual dict equality testing run without reference to internal ordering. This should be documented clearly since different people will - have different expectations. If a use case does arise, it's not hard to - explicitly craft an order based comparison: - ``list(od1.items())==list(od2.items())``. + have different expectations. If a use case does arise, it's not hard for + a user explicitly craft an order based comparison:: + + # Explict order-sensitive comparison + >>> list(od1.items())==list(od2.items()) What are the trade-offs of the possible underlying data structures? - * Keeping a sorted list of keys is very fast for all operations except - __delitem__() which becomes an O(n) exercise. This structure leads to - very simple code and little wasted space. + * Keeping a sorted list of keys is fast for all operations except + __delitem__() which becomes an O(n) exercise. This data structure leads + to very simple code and little wasted space. * Keeping a separate dictionary to record insertion sequence numbers makes the code a little bit more complex. All of the basic operations are O(1)

1 0

r70035 - python/branches/io-c/Lib/test/test_io.py
by benjamin.peterson Feb. 27, 2009

Feb. 27, 2009

Author: benjamin.peterson Date: Fri Feb 27 22:57:41 2009 New Revision: 70035 Log: good house keeping Modified: python/branches/io-c/Lib/test/test_io.py Modified: python/branches/io-c/Lib/test/test_io.py ============================================================================== --- python/branches/io-c/Lib/test/test_io.py (original) +++ python/branches/io-c/Lib/test/test_io.py Fri Feb 27 22:57:41 2009 @@ -2052,21 +2052,21 @@ self.assertTrue(isinstance(self.TextIOBase, abc.ABCMeta)) def _check_abc_inheritance(self, abcmodule): - f = self.open(support.TESTFN, "wb", buffering=0) - self.assertTrue(isinstance(f, abcmodule.IOBase)) - self.assertTrue(isinstance(f, abcmodule.RawIOBase)) - self.assertFalse(isinstance(f, abcmodule.BufferedIOBase)) - self.assertFalse(isinstance(f, abcmodule.TextIOBase)) - f = self.open(support.TESTFN, "wb") - self.assertTrue(isinstance(f, abcmodule.IOBase)) - self.assertFalse(isinstance(f, abcmodule.RawIOBase)) - self.assertTrue(isinstance(f, abcmodule.BufferedIOBase)) - self.assertFalse(isinstance(f, abcmodule.TextIOBase)) - f = self.open(support.TESTFN, "w") - self.assertTrue(isinstance(f, abcmodule.IOBase)) - self.assertFalse(isinstance(f, abcmodule.RawIOBase)) - self.assertFalse(isinstance(f, abcmodule.BufferedIOBase)) - self.assertTrue(isinstance(f, abcmodule.TextIOBase)) + with self.open(support.TESTFN, "wb", buffering=0) as f: + self.assertTrue(isinstance(f, abcmodule.IOBase)) + self.assertTrue(isinstance(f, abcmodule.RawIOBase)) + self.assertFalse(isinstance(f, abcmodule.BufferedIOBase)) + self.assertFalse(isinstance(f, abcmodule.TextIOBase)) + with self.open(support.TESTFN, "wb") as f: + self.assertTrue(isinstance(f, abcmodule.IOBase)) + self.assertFalse(isinstance(f, abcmodule.RawIOBase)) + self.assertTrue(isinstance(f, abcmodule.BufferedIOBase)) + self.assertFalse(isinstance(f, abcmodule.TextIOBase)) + with self.open(support.TESTFN, "w") as f: + self.assertTrue(isinstance(f, abcmodule.IOBase)) + self.assertFalse(isinstance(f, abcmodule.RawIOBase)) + self.assertFalse(isinstance(f, abcmodule.BufferedIOBase)) + self.assertTrue(isinstance(f, abcmodule.TextIOBase)) def test_abc_inheritance(self): # Test implementations inherit from their respective ABCs

1 0

r70034 - peps/trunk/pep-0375.txt
by benjamin.peterson Feb. 27, 2009

Feb. 27, 2009

Author: benjamin.peterson Date: Fri Feb 27 22:52:57 2009 New Revision: 70034 Log: add some things and links Modified: peps/trunk/pep-0375.txt Modified: peps/trunk/pep-0375.txt ============================================================================== --- peps/trunk/pep-0375.txt (original) +++ peps/trunk/pep-0375.txt Fri Feb 27 22:52:57 2009 @@ -50,13 +50,22 @@ - importlib - io in C - A reworked email package -- Adding an IP Address library to the stdlib. +- Adding an IP Address library to the stdlib [#iplib]. +- Update simplejson to the latest external version [#simplejson]_. +- Ordered dictionary for collections [#ordered]_. -References -========== +Footnotes +========= + +.. [#iplib] + http://bugs.python.org/issue3959 + +.. [#simplejson] + http://bugs.python.org/issue4136 -None yet! +.. [#ordered] PEP 372 + http://www.python.org/dev/peps/pep-0372/

1 0

r70033 - in python/branches/io-c: Lib/_pyio.py Lib/io.py Lib/test/test_io.py Modules/_bufferedio.c Modules/_bytesio.c Modules/_fileio.c Modules/_iobase.c Modules/_stringio.c Modules/_textio.c Modules/io.c
by antoine.pitrou Feb. 27, 2009

Feb. 27, 2009

Author: antoine.pitrou Date: Fri Feb 27 22:49:50 2009 New Revision: 70033 Log: The base classes now are ABCs. Modified: python/branches/io-c/Lib/_pyio.py python/branches/io-c/Lib/io.py python/branches/io-c/Lib/test/test_io.py python/branches/io-c/Modules/_bufferedio.c python/branches/io-c/Modules/_bytesio.c python/branches/io-c/Modules/_fileio.c python/branches/io-c/Modules/_iobase.c python/branches/io-c/Modules/_stringio.c python/branches/io-c/Modules/_textio.c python/branches/io-c/Modules/io.c Modified: python/branches/io-c/Lib/_pyio.py ============================================================================== --- python/branches/io-c/Lib/_pyio.py (original) +++ python/branches/io-c/Lib/_pyio.py Fri Feb 27 22:49:50 2009 @@ -5,18 +5,22 @@ import os import abc import codecs -#import _fileio # Import _thread instead of threading to reduce startup cost try: from _thread import allocate_lock as Lock except ImportError: from _dummy_thread import allocate_lock as Lock +import io from io import __all__ # open() uses st_blksize whenever we can DEFAULT_BUFFER_SIZE = 8 * 1024 # bytes +# NOTE: Base classes defined here are registered with the "official" ABCs +# defined in io.py. We don't use real inheritance though, because we don't +# want to inherit the C implementations. + class BlockingIOError(IOError): @@ -496,6 +500,8 @@ for line in lines: self.write(line) +io.IOBase.register(IOBase) + class RawIOBase(IOBase): @@ -551,7 +557,7 @@ """ self._unsupported("write") - +io.RawIOBase.register(RawIOBase) from _io import FileIO RawIOBase.register(FileIO) @@ -627,6 +633,8 @@ """ self._unsupported("write") +io.BufferedIOBase.register(BufferedIOBase) + class _BufferedIOMixin(BufferedIOBase): @@ -1218,6 +1226,8 @@ """ return None +io.TextIOBase.register(TextIOBase) + class IncrementalNewlineDecoder(codecs.IncrementalDecoder): r"""Codec used when reading a file in universal newlines mode. It wraps Modified: python/branches/io-c/Lib/io.py ============================================================================== --- python/branches/io-c/Lib/io.py (original) +++ python/branches/io-c/Lib/io.py Fri Feb 27 22:49:50 2009 @@ -54,24 +54,47 @@ import _io +import abc +# open() uses st_blksize whenever we can DEFAULT_BUFFER_SIZE = _io.DEFAULT_BUFFER_SIZE BlockingIOError = _io.BlockingIOError UnsupportedOperation = _io.UnsupportedOperation open = _io.open OpenWrapper = _io.open -IOBase = _io.IOBase -RawIOBase = _io.RawIOBase + +# Declaring ABCs in C is tricky so we do it here. +# Method descriptions and default implementations are inherited from the C +# version however. +class IOBase(_io._IOBase, metaclass=abc.ABCMeta): + pass + +class RawIOBase(_io._RawIOBase, IOBase): + pass + +class BufferedIOBase(_io._BufferedIOBase, IOBase): + pass + +class TextIOBase(_io._TextIOBase, IOBase): + pass + FileIO = _io.FileIO -BufferedIOBase = _io.BufferedIOBase BytesIO = _io.BytesIO StringIO = _io.StringIO BufferedReader = _io.BufferedReader BufferedWriter = _io.BufferedWriter BufferedRWPair = _io.BufferedRWPair BufferedRandom = _io.BufferedRandom -TextIOBase = _io.TextIOBase IncrementalNewlineDecoder = _io.IncrementalNewlineDecoder TextIOWrapper = _io.TextIOWrapper -# open() uses st_blksize whenever we can -DEFAULT_BUFFER_SIZE = 8 * 1024 # bytes + +RawIOBase.register(FileIO) + +BufferedIOBase.register(BytesIO) +BufferedIOBase.register(BufferedReader) +BufferedIOBase.register(BufferedWriter) +BufferedIOBase.register(BufferedRandom) +BufferedIOBase.register(BufferedRWPair) + +TextIOBase.register(StringIO) +TextIOBase.register(TextIOWrapper) Modified: python/branches/io-c/Lib/test/test_io.py ============================================================================== --- python/branches/io-c/Lib/test/test_io.py (original) +++ python/branches/io-c/Lib/test/test_io.py Fri Feb 27 22:49:50 2009 @@ -28,6 +28,7 @@ import unittest import weakref import gc +import abc from itertools import chain, cycle, count from collections import deque from test import support @@ -2043,23 +2044,38 @@ gc.collect() self.assert_(wr() is None, wr) - def test_abc_inheritance(self): - # Test implementations inherit (even virtually) from their respective ABCs + def test_abcs(self): + # Test the visible base classes are ABCs. + self.assertTrue(isinstance(self.IOBase, abc.ABCMeta)) + self.assertTrue(isinstance(self.RawIOBase, abc.ABCMeta)) + self.assertTrue(isinstance(self.BufferedIOBase, abc.ABCMeta)) + self.assertTrue(isinstance(self.TextIOBase, abc.ABCMeta)) + + def _check_abc_inheritance(self, abcmodule): f = self.open(support.TESTFN, "wb", buffering=0) - self.assertTrue(isinstance(f, self.IOBase)) - self.assertTrue(isinstance(f, self.RawIOBase)) - self.assertFalse(isinstance(f, self.BufferedIOBase)) - self.assertFalse(isinstance(f, self.TextIOBase)) + self.assertTrue(isinstance(f, abcmodule.IOBase)) + self.assertTrue(isinstance(f, abcmodule.RawIOBase)) + self.assertFalse(isinstance(f, abcmodule.BufferedIOBase)) + self.assertFalse(isinstance(f, abcmodule.TextIOBase)) f = self.open(support.TESTFN, "wb") - self.assertTrue(isinstance(f, self.IOBase)) - self.assertFalse(isinstance(f, self.RawIOBase)) - self.assertTrue(isinstance(f, self.BufferedIOBase)) - self.assertFalse(isinstance(f, self.TextIOBase)) + self.assertTrue(isinstance(f, abcmodule.IOBase)) + self.assertFalse(isinstance(f, abcmodule.RawIOBase)) + self.assertTrue(isinstance(f, abcmodule.BufferedIOBase)) + self.assertFalse(isinstance(f, abcmodule.TextIOBase)) f = self.open(support.TESTFN, "w") - self.assertTrue(isinstance(f, self.IOBase)) - self.assertFalse(isinstance(f, self.RawIOBase)) - self.assertFalse(isinstance(f, self.BufferedIOBase)) - self.assertTrue(isinstance(f, self.TextIOBase)) + self.assertTrue(isinstance(f, abcmodule.IOBase)) + self.assertFalse(isinstance(f, abcmodule.RawIOBase)) + self.assertFalse(isinstance(f, abcmodule.BufferedIOBase)) + self.assertTrue(isinstance(f, abcmodule.TextIOBase)) + + def test_abc_inheritance(self): + # Test implementations inherit from their respective ABCs + self._check_abc_inheritance(self) + + def test_abc_inheritance_official(self): + # Test implementations inherit from the official ABCs of the + # baseline "io" module. + self._check_abc_inheritance(io) class CMiscIOTest(MiscIOTest): io = io Modified: python/branches/io-c/Modules/_bufferedio.c ============================================================================== --- python/branches/io-c/Modules/_bufferedio.c (original) +++ python/branches/io-c/Modules/_bufferedio.c Fri Feb 27 22:49:50 2009 @@ -136,7 +136,7 @@ PyTypeObject PyBufferedIOBase_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "BufferedIOBase", /*tp_name*/ + "_io._BufferedIOBase", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ 0, /*tp_dealloc*/ @@ -1374,7 +1374,7 @@ PyTypeObject PyBufferedReader_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "BufferedReader", /*tp_name*/ + "_io.BufferedReader", /*tp_name*/ sizeof(BufferedObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)BufferedObject_dealloc, /*tp_dealloc*/ @@ -1712,7 +1712,7 @@ PyTypeObject PyBufferedWriter_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "BufferedWriter", /*tp_name*/ + "_io.BufferedWriter", /*tp_name*/ sizeof(BufferedObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)BufferedObject_dealloc, /*tp_dealloc*/ @@ -1957,8 +1957,8 @@ PyTypeObject PyBufferedRWPair_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "BufferedRWPair", /*tp_name*/ - sizeof(BufferedRWPairObject), /*tp_basicsize*/ + "_io.BufferedRWPair", /*tp_name*/ + sizeof(BufferedRWPairObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)BufferedRWPair_dealloc, /*tp_dealloc*/ 0, /*tp_print*/ @@ -2088,7 +2088,7 @@ PyTypeObject PyBufferedRandom_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "BufferedRandom", /*tp_name*/ + "_io.BufferedRandom", /*tp_name*/ sizeof(BufferedObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)BufferedObject_dealloc, /*tp_dealloc*/ Modified: python/branches/io-c/Modules/_bytesio.c ============================================================================== --- python/branches/io-c/Modules/_bytesio.c (original) +++ python/branches/io-c/Modules/_bytesio.c Fri Feb 27 22:49:50 2009 @@ -716,7 +716,7 @@ PyTypeObject PyBytesIO_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "_bytesio._BytesIO", /*tp_name*/ + "_io.BytesIO", /*tp_name*/ sizeof(BytesIOObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)bytesio_dealloc, /*tp_dealloc*/ Modified: python/branches/io-c/Modules/_fileio.c ============================================================================== --- python/branches/io-c/Modules/_fileio.c (original) +++ python/branches/io-c/Modules/_fileio.c Fri Feb 27 22:49:50 2009 @@ -956,7 +956,7 @@ PyTypeObject PyFileIO_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "FileIO", + "_io.FileIO", sizeof(PyFileIOObject), 0, (destructor)fileio_dealloc, /* tp_dealloc */ Modified: python/branches/io-c/Modules/_iobase.c ============================================================================== --- python/branches/io-c/Modules/_iobase.c (original) +++ python/branches/io-c/Modules/_iobase.c Fri Feb 27 22:49:50 2009 @@ -706,7 +706,7 @@ PyTypeObject PyIOBase_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "IOBase", /*tp_name*/ + "_io._IOBase", /*tp_name*/ sizeof(IOBaseObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)IOBase_dealloc, /*tp_dealloc*/ @@ -862,7 +862,7 @@ PyTypeObject PyRawIOBase_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "RawIOBase", /*tp_name*/ + "_io._RawIOBase", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ 0, /*tp_dealloc*/ Modified: python/branches/io-c/Modules/_stringio.c ============================================================================== --- python/branches/io-c/Modules/_stringio.c (original) +++ python/branches/io-c/Modules/_stringio.c Fri Feb 27 22:49:50 2009 @@ -728,7 +728,7 @@ PyTypeObject PyStringIO_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "StringIO", /*tp_name*/ + "_io.StringIO", /*tp_name*/ sizeof(StringIOObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)stringio_dealloc, /*tp_dealloc*/ Modified: python/branches/io-c/Modules/_textio.c ============================================================================== --- python/branches/io-c/Modules/_textio.c (original) +++ python/branches/io-c/Modules/_textio.c Fri Feb 27 22:49:50 2009 @@ -107,7 +107,7 @@ PyTypeObject PyTextIOBase_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "TextIOBase", /*tp_name*/ + "_io._TextIOBase", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ 0, /*tp_dealloc*/ @@ -526,7 +526,7 @@ PyTypeObject PyIncrementalNewlineDecoder_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "IncrementalNewlineDecoder", /*tp_name*/ + "_io.IncrementalNewlineDecoder", /*tp_name*/ sizeof(PyNewLineDecoderObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)IncrementalNewlineDecoder_dealloc, /*tp_dealloc*/ @@ -2348,7 +2348,7 @@ PyTypeObject PyTextIOWrapper_Type = { PyVarObject_HEAD_INIT(NULL, 0) - "TextIOWrapper", /*tp_name*/ + "_io.TextIOWrapper", /*tp_name*/ sizeof(PyTextIOWrapperObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ (destructor)TextIOWrapper_dealloc, /*tp_dealloc*/ Modified: python/branches/io-c/Modules/io.c ============================================================================== --- python/branches/io-c/Modules/io.c (original) +++ python/branches/io-c/Modules/io.c Fri Feb 27 22:49:50 2009 @@ -653,18 +653,15 @@ _PyExc_BlockingIOError.tp_base = (PyTypeObject *) PyExc_IOError; ADD_TYPE(&_PyExc_BlockingIOError, "BlockingIOError"); - /* IOBase */ - ADD_TYPE(&PyIOBase_Type, "IOBase"); - - /* RawIOBase */ - ADD_TYPE(&PyRawIOBase_Type, "RawIOBase"); - - /* BufferedIOBase */ - ADD_TYPE(&PyBufferedIOBase_Type, "BufferedIOBase"); - - /* TextIOBase */ - ADD_TYPE(&PyTextIOBase_Type,"TextIOBase"); + /* Concrete base types of the IO ABCs. + (the ABCs themselves are declared through inheritance in io.py) + */ + ADD_TYPE(&PyIOBase_Type, "_IOBase"); + ADD_TYPE(&PyRawIOBase_Type, "_RawIOBase"); + ADD_TYPE(&PyBufferedIOBase_Type, "_BufferedIOBase"); + ADD_TYPE(&PyTextIOBase_Type, "_TextIOBase"); + /* Implementation of concrete IO objects. */ /* FileIO */ PyFileIO_Type.tp_base = &PyRawIOBase_Type; ADD_TYPE(&PyFileIO_Type, "FileIO");

1 0

r70032 - peps/trunk/pep-0372.txt
by raymond.hettinger Feb. 27, 2009

Feb. 27, 2009

Author: raymond.hettinger Date: Fri Feb 27 22:36:22 2009 New Revision: 70032 Log: Fix markup. Modified: peps/trunk/pep-0372.txt Modified: peps/trunk/pep-0372.txt ============================================================================== --- peps/trunk/pep-0372.txt (original) +++ peps/trunk/pep-0372.txt Fri Feb 27 22:36:22 2009 @@ -135,10 +135,10 @@ The same as for regular dicts: The latter item overrides the former. This has the side-effect that the position of the first - key is used because only the value is actually overwritten: + key is used because only the value is actually overwritten:: - >>> odict([('a', 1), ('b', 2), ('a', 3)]) - collections.odict([('a', 3), ('b', 2)]) + >>> odict([('a', 1), ('b', 2), ('a', 3)]) + collections.odict([('a', 3), ('b', 2)]) This behavior is consistent with existing implementations in Python, the PHP array and the hashmap in Ruby 1.9. @@ -183,7 +183,7 @@ How well does odict work with the json module, PyYAML, and ConfigParser? - For json, the good news is that json's encoder respects odict's iteration order: + For json, the good news is that json's encoder respects odict's iteration order:: >>> items = [('one', 1), ('two', 2), ('three',3), ('four',4), ('five',5)] >>> json.dumps(OrderedDict(items)) @@ -193,13 +193,13 @@ dictionary so order is lost before the object hook sees it. This problem is being fixed for Python 2.7/3.1 by adding an new hook that preserves order (see http://bugs.python.org/issue5381 ). - With the new hook, order can be preserved: + With the new hook, order can be preserved:: >>> jtext = '{"one": 1, "two": 2, "three": 3, "four": 4, "five": 5}' >>> json.loads(jtext, object_pairs_hook=OrderedDict) OrderedDict({'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5}) - For PyYAML, a full round-trip is problem free: + For PyYAML, a full round-trip is problem free:: >>> ytext = yaml.dump(OrderedDict(items)) >>> print ytext @@ -213,8 +213,8 @@ >>> yaml.load(ytext) OrderedDict({'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5}) - For the ConfigParser module, round-tripping is problem free. Custom - dicts were added in Py2.6 specifically to support ordered dictionaries: + For the ConfigParser module, round-tripping is problem free. Custom + dicts were added in Py2.6 specifically to support ordered dictionaries:: >>> config = ConfigParser(dict_type=OrderedDict) >>> config.read('myconfig.ini')

1 0

r70031 - peps/trunk/pep-0372.txt
by raymond.hettinger Feb. 27, 2009

Feb. 27, 2009

Author: raymond.hettinger Date: Fri Feb 27 22:23:56 2009 New Revision: 70031 Log: Update notes on integration with ConfigParser and json. Modified: peps/trunk/pep-0372.txt Modified: peps/trunk/pep-0372.txt ============================================================================== --- peps/trunk/pep-0372.txt (original) +++ peps/trunk/pep-0372.txt Fri Feb 27 22:23:56 2009 @@ -181,7 +181,7 @@ dbm) is likely a better fit. It would be a mistake to try to be all things to all users. -How well does odict work with the json module and PyYAML? +How well does odict work with the json module, PyYAML, and ConfigParser? For json, the good news is that json's encoder respects odict's iteration order: @@ -189,13 +189,15 @@ >>> json.dumps(OrderedDict(items)) '{"one": 1, "two": 2, "three": 3, "four": 4, "five": 5}' - The bad news is that the object_hook for json decoders will pass in an - already built dictionary so that the order is lost before the object - hook sees it: + In Py2.6, the object_hook for json decoders passes-in an already built + dictionary so order is lost before the object hook sees it. This + problem is being fixed for Python 2.7/3.1 by adding an new hook that + preserves order (see http://bugs.python.org/issue5381 ). + With the new hook, order can be preserved: >>> jtext = '{"one": 1, "two": 2, "three": 3, "four": 4, "five": 5}' - >>> json.loads(jtext, object_hook=OrderedDict) - OrderedDict({u'four': 4, u'three': 3, u'five': 5, u'two': 2, u'one': 1}) + >>> json.loads(jtext, object_pairs_hook=OrderedDict) + OrderedDict({'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5}) For PyYAML, a full round-trip is problem free: @@ -211,6 +213,14 @@ >>> yaml.load(ytext) OrderedDict({'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5}) + For the ConfigParser module, round-tripping is problem free. Custom + dicts were added in Py2.6 specifically to support ordered dictionaries: + + >>> config = ConfigParser(dict_type=OrderedDict) + >>> config.read('myconfig.ini') + >>> config.remove_option('Log', 'error') + >>> config.write(open('myconfig.ini', 'w')) + How does odict handle equality testing? Being a dict, one might expect equality tests to not care about order. For

1 0

buildbot failure in sparc solaris10 gcc 3.x
by buildbot＠python.org Feb. 27, 2009

Feb. 27, 2009

The Buildbot has detected a new failure of sparc solaris10 gcc 3.x. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20solaris10%20gcc%203.x/builds… Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: loewis-sun Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: georg.brandl BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_posix ====================================================================== ERROR: test_getcwd_long_pathnames (test.test_posix.PosixTester) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/3.x.loewis-sun/build/Lib/test/test_posix.py", line 252, in test_getcwd_long_pathnames support.rmtree(base_path) File "/home2/buildbot/slave/3.x.loewis-sun/build/Lib/test/support.py", line 98, in rmtree shutil.rmtree(path) File "/home2/buildbot/slave/3.x.loewis-sun/build/Lib/shutil.py", line 225, in rmtree onerror(os.rmdir, path, sys.exc_info()) File "/home2/buildbot/slave/3.x.loewis-sun/build/Lib/shutil.py", line 223, in rmtree os.rmdir(path) OSError: [Errno 22] Invalid argument: '/home2/buildbot/slave/3.x.loewis-sun/build/@test.getcwd/@test.getcwd' sincerely, -The Buildbot

1 0

buildbot failure in amd64 gentoo 3.0
by buildbot＠python.org Feb. 27, 2009

Feb. 27, 2009

The Buildbot has detected a new failure of amd64 gentoo 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%20gentoo%203.0/builds/156 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: norwitz-amd64 Build Reason: Build Source Stamp: [branch branches/release30-maint] HEAD Blamelist: georg.brandl BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_smtplib make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0