Mailman 3 January 2010 - Python-checkins

r77814 - python/branches/release26-maint/Doc/library/socket.rst
by ezio.melotti Jan. 28, 2010

Jan. 28, 2010

Author: ezio.melotti Date: Thu Jan 28 05:27:56 2010 New Revision: 77814 Log: #7791: remove reference to ipaddr Modified: python/branches/release26-maint/Doc/library/socket.rst Modified: python/branches/release26-maint/Doc/library/socket.rst ============================================================================== --- python/branches/release26-maint/Doc/library/socket.rst (original) +++ python/branches/release26-maint/Doc/library/socket.rst Thu Jan 28 05:27:56 2010 @@ -440,11 +440,6 @@ Availability: Unix (maybe not all platforms). - .. seealso:: - - :func:`ipaddr.BaseIP.packed` - Platform-independent conversion to a packed, binary format. - .. versionadded:: 2.3

1 0

r77813 - python/branches/py3k
by benjamin.peterson Jan. 28, 2010

Jan. 28, 2010

Author: benjamin.peterson Date: Thu Jan 28 03:22:10 2010 New Revision: 77813 Log: Blocked revisions 77811-77812 via svnmerge ........ r77811 | benjamin.peterson | 2010-01-27 20:15:02 -0600 (Wed, 27 Jan 2010) | 1 line an -> a ........ r77812 | benjamin.peterson | 2010-01-27 20:18:25 -0600 (Wed, 27 Jan 2010) | 1 line avoid a py3k warning from __hash__ ........ Modified: python/branches/py3k/ (props changed)

1 0

r77812 - python/trunk/Lib/UserDict.py
by benjamin.peterson Jan. 28, 2010

Jan. 28, 2010

Author: benjamin.peterson Date: Thu Jan 28 03:18:25 2010 New Revision: 77812 Log: avoid a py3k warning from __hash__ Modified: python/trunk/Lib/UserDict.py Modified: python/trunk/Lib/UserDict.py ============================================================================== --- python/trunk/Lib/UserDict.py (original) +++ python/trunk/Lib/UserDict.py Thu Jan 28 03:18:25 2010 @@ -13,6 +13,7 @@ return cmp(self.data, dict.data) else: return cmp(self.data, dict) + __hash__ = None # Avoid Py3k warning def __len__(self): return len(self.data) def __getitem__(self, key): if key in self.data:

1 0

r77811 - python/trunk/Misc/NEWS
by benjamin.peterson Jan. 28, 2010

Jan. 28, 2010

Author: benjamin.peterson Date: Thu Jan 28 03:15:02 2010 New Revision: 77811 Log: an -> a Modified: python/trunk/Misc/NEWS Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu Jan 28 03:15:02 2010 @@ -47,6 +47,8 @@ Library ------- +- UserDict is now a new-style class. + - Issue #7610: Reworked implementation of the internal :class:`zipfile.ZipExtFile` class used to represent files stored inside an archive. The new implementation is significantly faster and can @@ -180,8 +182,6 @@ Library ------- -- UserDict is now an new-style class. - - Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool, allowing for a maximum number of tasks within the pool to be completed by the worker before that worker is terminated, and a new one created to

1 0

r77810 - in python/branches/py3k: Lib/zipfile.py
by ezio.melotti Jan. 28, 2010

Jan. 28, 2010

Author: ezio.melotti Date: Thu Jan 28 02:44:41 2010 New Revision: 77810 Log: Merged revisions 77809 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77809 | ezio.melotti | 2010-01-28 03:41:30 +0200 (Thu, 28 Jan 2010) | 1 line avoid to use zlib when the compress type is not ZIP_DEFLATED ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/zipfile.py Modified: python/branches/py3k/Lib/zipfile.py ============================================================================== --- python/branches/py3k/Lib/zipfile.py (original) +++ python/branches/py3k/Lib/zipfile.py Thu Jan 28 02:44:41 2010 @@ -463,7 +463,12 @@ self._fileobj = fileobj self._decrypter = decrypter - self._decompressor = zlib.decompressobj(-15) + self._compress_type = zipinfo.compress_type + self._compress_size = zipinfo.compress_size + self._compress_left = zipinfo.compress_size + + if self._compress_type == ZIP_DEFLATED: + self._decompressor = zlib.decompressobj(-15) self._unconsumed = b'' self._readbuffer = b'' @@ -472,10 +477,6 @@ self._universal = 'U' in mode self.newlines = None - self._compress_type = zipinfo.compress_type - self._compress_size = zipinfo.compress_size - self._compress_left = zipinfo.compress_size - # Adjust read size for encrypted files since the first 12 bytes # are for the encryption/password information. if self._decrypter is not None: @@ -591,7 +592,8 @@ self._unconsumed += data # Handle unconsumed data. - if len(self._unconsumed) > 0 and n > len_readbuffer: + if (len(self._unconsumed) > 0 and n > len_readbuffer and + self._compress_type == ZIP_DEFLATED): data = self._decompressor.decompress( self._unconsumed, max(n - len_readbuffer, self.MIN_READ_SIZE)

1 0

r77809 - python/trunk/Lib/zipfile.py
by ezio.melotti Jan. 28, 2010

Jan. 28, 2010

Author: ezio.melotti Date: Thu Jan 28 02:41:30 2010 New Revision: 77809 Log: avoid to use zlib when the compress type is not ZIP_DEFLATED Modified: python/trunk/Lib/zipfile.py Modified: python/trunk/Lib/zipfile.py ============================================================================== --- python/trunk/Lib/zipfile.py (original) +++ python/trunk/Lib/zipfile.py Thu Jan 28 02:41:30 2010 @@ -471,7 +471,12 @@ self._fileobj = fileobj self._decrypter = decrypter - self._decompressor = zlib.decompressobj(-15) + self._compress_type = zipinfo.compress_type + self._compress_size = zipinfo.compress_size + self._compress_left = zipinfo.compress_size + + if self._compress_type == ZIP_DEFLATED: + self._decompressor = zlib.decompressobj(-15) self._unconsumed = '' self._readbuffer = '' @@ -480,10 +485,6 @@ self._universal = 'U' in mode self.newlines = None - self._compress_type = zipinfo.compress_type - self._compress_size = zipinfo.compress_size - self._compress_left = zipinfo.compress_size - # Adjust read size for encrypted files since the first 12 bytes # are for the encryption/password information. if self._decrypter is not None: @@ -599,7 +600,8 @@ self._unconsumed += data # Handle unconsumed data. - if len(self._unconsumed) > 0 and n > len_readbuffer: + if (len(self._unconsumed) > 0 and n > len_readbuffer and + self._compress_type == ZIP_DEFLATED): data = self._decompressor.decompress( self._unconsumed, max(n - len_readbuffer, self.MIN_READ_SIZE)

1 0

r77808 - python/branches/py3k
by benjamin.peterson Jan. 28, 2010

Jan. 28, 2010

Author: benjamin.peterson Date: Thu Jan 28 02:31:31 2010 New Revision: 77808 Log: Blocked revisions 77806 via svnmerge ........ r77806 | benjamin.peterson | 2010-01-27 19:24:46 -0600 (Wed, 27 Jan 2010) | 1 line add compat note ........ Modified: python/branches/py3k/ (props changed)

1 0

r77807 - in python/branches/release26-maint: Lib/UserDict.py Lib/abc.py Lib/test/test_abc.py Misc/NEWS
by benjamin.peterson Jan. 28, 2010

Jan. 28, 2010

Author: benjamin.peterson Date: Thu Jan 28 02:31:13 2010 New Revision: 77807 Log: revert r77790. it requires a new-style class change Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/UserDict.py python/branches/release26-maint/Lib/abc.py python/branches/release26-maint/Lib/test/test_abc.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/UserDict.py ============================================================================== --- python/branches/release26-maint/Lib/UserDict.py (original) +++ python/branches/release26-maint/Lib/UserDict.py Thu Jan 28 02:31:13 2010 @@ -1,6 +1,6 @@ """A more or less complete user-defined wrapper around dictionary objects.""" -class UserDict(object): +class UserDict: def __init__(self, dict=None, **kwargs): self.data = {} if dict is not None: Modified: python/branches/release26-maint/Lib/abc.py ============================================================================== --- python/branches/release26-maint/Lib/abc.py (original) +++ python/branches/release26-maint/Lib/abc.py Thu Jan 28 02:31:13 2010 @@ -96,7 +96,7 @@ def register(cls, subclass): """Register a virtual subclass of an ABC.""" - if not isinstance(subclass, type): + if not isinstance(cls, type): raise TypeError("Can only register classes") if issubclass(subclass, cls): return # Already a subclass Modified: python/branches/release26-maint/Lib/test/test_abc.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_abc.py (original) +++ python/branches/release26-maint/Lib/test/test_abc.py Thu Jan 28 02:31:13 2010 @@ -149,11 +149,6 @@ self.assertRaises(RuntimeError, C.register, A) # cycles not allowed C.register(B) # ok - def test_register_non_class(self): - class A(object): - __metaclass__ = abc.ABCMeta - self.assertRaises(TypeError, A.register, 4) - def test_registration_transitiveness(self): class A: __metaclass__ = abc.ABCMeta Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Thu Jan 28 02:31:13 2010 @@ -58,8 +58,6 @@ file position to the given argument, which goes against the tradition of ftruncate() and other truncation APIs. Patch by Pascal Chambon. -- Issue #7792: Registering non-classes to ABCs raised an obscure error. - - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when the release file is empty.

1 0

r77806 - python/trunk/Misc/NEWS
by benjamin.peterson Jan. 28, 2010

Jan. 28, 2010

Author: benjamin.peterson Date: Thu Jan 28 02:24:46 2010 New Revision: 77806 Log: add compat note Modified: python/trunk/Misc/NEWS Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu Jan 28 02:24:46 2010 @@ -180,6 +180,8 @@ Library ------- +- UserDict is now an new-style class. + - Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool, allowing for a maximum number of tasks within the pool to be completed by the worker before that worker is terminated, and a new one created to

1 0