Mailman 3 November 2007 - Python-checkins

buildbot failure in PPC64 Debian trunk
by buildbot＠python.org 05 Nov '07

05 Nov '07

The Buildbot has detected a new failure of PPC64 Debian trunk. Full details are available at: http://www.python.org/dev/buildbot/all/PPC64%20Debian%20trunk/builds/313 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-ppc64 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: gregory.p.smith,mark.summerfield BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_xmlrpc ====================================================================== ERROR: test_fail_with_info (test.test_xmlrpc.FailingServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/test/test_xmlrpc.py", line 517, in test_fail_with_info p.pow(6,8) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1157, in __call__ return self.__send(self.__name, args) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1447, in __request verbose=self.__verbose File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1195, in request errcode, errmsg, headers = h.getreply() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 1006, in getreply response = self._conn.getresponse() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 932, in getresponse response.begin() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 415, in begin self.msg = HTTPMessage(self.fp, 0) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/mimetools.py", line 16, in __init__ rfc822.Message.__init__(self, fp, seekable) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/rfc822.py", line 104, in __init__ self.readheaders() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 271, in readheaders line = self.fp.readline() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/socket.py", line 351, in readline data = recv(1) error: [Errno 104] Connection reset by peer make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

r58870 - in python/branches/release25-maint: Doc/lib/libhashlib.tex Lib/hmac.py Lib/test/test_hmac.py Misc/NEWS
by gregory.p.smith 05 Nov '07

05 Nov '07

Author: gregory.p.smith Date: Tue Nov 6 01:32:04 2007 New Revision: 58870 Modified: python/branches/release25-maint/Doc/lib/libhashlib.tex python/branches/release25-maint/Lib/hmac.py python/branches/release25-maint/Lib/test/test_hmac.py python/branches/release25-maint/Misc/NEWS Log: Backport r58868: Fixes Issue 1385: The hmac module now computes the correct hmac when using hashes with a block size other than 64 bytes (such as sha384 and sha512). Modified: python/branches/release25-maint/Doc/lib/libhashlib.tex ============================================================================== --- python/branches/release25-maint/Doc/lib/libhashlib.tex (original) +++ python/branches/release25-maint/Doc/lib/libhashlib.tex Tue Nov 6 01:32:04 2007 @@ -72,7 +72,11 @@ returned by the constructors: \begin{datadesc}{digest_size} - The size of the resulting digest in bytes. + The size of the resulting hash in bytes. +\end{datadesc} + +\begin{datadesc}{block_size} + The internal block size of the hash algorithm in bytes. \end{datadesc} A hash object has the following methods: Modified: python/branches/release25-maint/Lib/hmac.py ============================================================================== --- python/branches/release25-maint/Lib/hmac.py (original) +++ python/branches/release25-maint/Lib/hmac.py Tue Nov 6 01:32:04 2007 @@ -49,7 +49,15 @@ self.inner = self.digest_cons() self.digest_size = self.inner.digest_size - blocksize = 64 + if hasattr(self.inner, 'block_size'): + blocksize = self.inner.block_size + if blocksize < 16: + # Very low blocksize, most likely a legacy value like + # Lib/sha.py and Lib/md5.py have. + blocksize = 64 + else: + blocksize = 64 + ipad = "\x36" * blocksize opad = "\x5C" * blocksize Modified: python/branches/release25-maint/Lib/test/test_hmac.py ============================================================================== --- python/branches/release25-maint/Lib/test/test_hmac.py (original) +++ python/branches/release25-maint/Lib/test/test_hmac.py Tue Nov 6 01:32:04 2007 @@ -1,5 +1,6 @@ import hmac import sha +import hashlib import unittest from test import test_support @@ -75,6 +76,130 @@ "and Larger Than One Block-Size Data"), "e8e99d0f45237d786d6bbaa7965c7808bbff1a91") + def _rfc4231_test_cases(self, hashfunc): + def hmactest(key, data, hexdigests): + h = hmac.HMAC(key, data, digestmod=hashfunc) + self.assertEqual(h.hexdigest().lower(), hexdigests[hashfunc]) + + # 4.2. Test Case 1 + hmactest(key = '\x0b'*20, + data = 'Hi There', + hexdigests = { + hashlib.sha224: '896fb1128abbdf196832107cd49df33f' + '47b4b1169912ba4f53684b22', + hashlib.sha256: 'b0344c61d8db38535ca8afceaf0bf12b' + '881dc200c9833da726e9376c2e32cff7', + hashlib.sha384: 'afd03944d84895626b0825f4ab46907f' + '15f9dadbe4101ec682aa034c7cebc59c' + 'faea9ea9076ede7f4af152e8b2fa9cb6', + hashlib.sha512: '87aa7cdea5ef619d4ff0b4241a1d6cb0' + '2379f4e2ce4ec2787ad0b30545e17cde' + 'daa833b7d6b8a702038b274eaea3f4e4' + 'be9d914eeb61f1702e696c203a126854', + }) + + # 4.3. Test Case 2 + hmactest(key = 'Jefe', + data = 'what do ya want for nothing?', + hexdigests = { + hashlib.sha224: 'a30e01098bc6dbbf45690f3a7e9e6d0f' + '8bbea2a39e6148008fd05e44', + hashlib.sha256: '5bdcc146bf60754e6a042426089575c7' + '5a003f089d2739839dec58b964ec3843', + hashlib.sha384: 'af45d2e376484031617f78d2b58a6b1b' + '9c7ef464f5a01b47e42ec3736322445e' + '8e2240ca5e69e2c78b3239ecfab21649', + hashlib.sha512: '164b7a7bfcf819e2e395fbe73b56e0a3' + '87bd64222e831fd610270cd7ea250554' + '9758bf75c05a994a6d034f65f8f0e6fd' + 'caeab1a34d4a6b4b636e070a38bce737', + }) + + # 4.4. Test Case 3 + hmactest(key = '\xaa'*20, + data = '\xdd'*50, + hexdigests = { + hashlib.sha224: '7fb3cb3588c6c1f6ffa9694d7d6ad264' + '9365b0c1f65d69d1ec8333ea', + hashlib.sha256: '773ea91e36800e46854db8ebd09181a7' + '2959098b3ef8c122d9635514ced565fe', + hashlib.sha384: '88062608d3e6ad8a0aa2ace014c8a86f' + '0aa635d947ac9febe83ef4e55966144b' + '2a5ab39dc13814b94e3ab6e101a34f27', + hashlib.sha512: 'fa73b0089d56a284efb0f0756c890be9' + 'b1b5dbdd8ee81a3655f83e33b2279d39' + 'bf3e848279a722c806b485a47e67c807' + 'b946a337bee8942674278859e13292fb', + }) + + # 4.5. Test Case 4 + hmactest(key = ''.join([chr(x) for x in xrange(0x01, 0x19+1)]), + data = '\xcd'*50, + hexdigests = { + hashlib.sha224: '6c11506874013cac6a2abc1bb382627c' + 'ec6a90d86efc012de7afec5a', + hashlib.sha256: '82558a389a443c0ea4cc819899f2083a' + '85f0faa3e578f8077a2e3ff46729665b', + hashlib.sha384: '3e8a69b7783c25851933ab6290af6ca7' + '7a9981480850009cc5577c6e1f573b4e' + '6801dd23c4a7d679ccf8a386c674cffb', + hashlib.sha512: 'b0ba465637458c6990e5a8c5f61d4af7' + 'e576d97ff94b872de76f8050361ee3db' + 'a91ca5c11aa25eb4d679275cc5788063' + 'a5f19741120c4f2de2adebeb10a298dd', + }) + + # 4.7. Test Case 6 + hmactest(key = '\xaa'*131, + data = 'Test Using Larger Than Block-Siz' + 'e Key - Hash Key First', + hexdigests = { + hashlib.sha224: '95e9a0db962095adaebe9b2d6f0dbce2' + 'd499f112f2d2b7273fa6870e', + hashlib.sha256: '60e431591ee0b67f0d8a26aacbf5b77f' + '8e0bc6213728c5140546040f0ee37f54', + hashlib.sha384: '4ece084485813e9088d2c63a041bc5b4' + '4f9ef1012a2b588f3cd11f05033ac4c6' + '0c2ef6ab4030fe8296248df163f44952', + hashlib.sha512: '80b24263c7c1a3ebb71493c1dd7be8b4' + '9b46d1f41b4aeec1121b013783f8f352' + '6b56d037e05f2598bd0fd2215d6a1e52' + '95e64f73f63f0aec8b915a985d786598', + }) + + # 4.8. Test Case 7 + hmactest(key = '\xaa'*131, + data = 'This is a test using a larger th' + 'an block-size key and a larger t' + 'han block-size data. The key nee' + 'ds to be hashed before being use' + 'd by the HMAC algorithm.', + hexdigests = { + hashlib.sha224: '3a854166ac5d9f023f54d517d0b39dbd' + '946770db9c2b95c9f6f565d1', + hashlib.sha256: '9b09ffa71b942fcb27635fbcd5b0e944' + 'bfdc63644f0713938a7f51535c3a35e2', + hashlib.sha384: '6617178e941f020d351e2f254e8fd32c' + '602420feb0b8fb9adccebb82461e99c5' + 'a678cc31e799176d3860e6110c46523e', + hashlib.sha512: 'e37b6a775dc87dbaa4dfa9f96e5e3ffd' + 'debd71f8867289865df5a32d20cdc944' + 'b6022cac3c4982b10d5eeb55c3e4de15' + '134676fb6de0446065c97440fa8c6a58', + }) + + def test_sha224_rfc4231(self): + self._rfc4231_test_cases(hashlib.sha224) + + def test_sha256_rfc4231(self): + self._rfc4231_test_cases(hashlib.sha256) + + def test_sha384_rfc4231(self): + self._rfc4231_test_cases(hashlib.sha384) + + def test_sha512_rfc4231(self): + self._rfc4231_test_cases(hashlib.sha512) + class ConstructorTestCase(unittest.TestCase): Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Tue Nov 6 01:32:04 2007 @@ -106,6 +106,9 @@ - Bug #1693258: IDLE would show two "Preferences" menu's with some versions of Tcl/Tk +- Issue1385: The hmac module now computes the correct hmac when using hashes + with a block size other than 64 bytes (such as sha384 and sha512). + Extension Modules -----------------

1 0

r58868 - in python/trunk: Doc/library/hashlib.rst Lib/hmac.py Lib/test/test_hmac.py Misc/NEWS
by gregory.p.smith 05 Nov '07

05 Nov '07

Author: gregory.p.smith Date: Tue Nov 6 01:19:03 2007 New Revision: 58868 Modified: python/trunk/Doc/library/hashlib.rst python/trunk/Lib/hmac.py python/trunk/Lib/test/test_hmac.py python/trunk/Misc/NEWS Log: Fixes Issue 1385: The hmac module now computes the correct hmac when using hashes with a block size other than 64 bytes (such as sha384 and sha512). Modified: python/trunk/Doc/library/hashlib.rst ============================================================================== --- python/trunk/Doc/library/hashlib.rst (original) +++ python/trunk/Doc/library/hashlib.rst Tue Nov 6 01:19:03 2007 @@ -48,6 +48,10 @@ >>> m.update(" the spammish repetition") >>> m.digest() '\xbbd\x9c\x83\xdd\x1e\xa5\xc9\xd9\xde\xc9\xa1\x8d\xf0\xff\xe9' + >>> m.digest_size + 16 + >>> m.block_size + 64 More condensed:: @@ -72,7 +76,11 @@ .. data:: digest_size - The size of the resulting digest in bytes. + The size of the resulting hash in bytes. + +.. data:: block_size + + The internal block size of the hash algorithm in bytes. A hash object has the following methods: Modified: python/trunk/Lib/hmac.py ============================================================================== --- python/trunk/Lib/hmac.py (original) +++ python/trunk/Lib/hmac.py Tue Nov 6 01:19:03 2007 @@ -3,6 +3,8 @@ Implements the HMAC algorithm as described by RFC 2104. """ +import warnings as _warnings + trans_5C = "".join ([chr (x ^ 0x5C) for x in xrange(256)]) trans_36 = "".join ([chr (x ^ 0x36) for x in xrange(256)]) @@ -16,7 +18,7 @@ _secret_backdoor_key = [] class HMAC: - """RFC2104 HMAC class. + """RFC 2104 HMAC class. Also complies with RFC 4231. This supports the API for Cryptographic Hash Functions (PEP 247). """ @@ -48,7 +50,21 @@ self.inner = self.digest_cons() self.digest_size = self.inner.digest_size - blocksize = self.blocksize + if hasattr(self.inner, 'block_size'): + blocksize = self.inner.block_size + if blocksize < 16: + # Very low blocksize, most likely a legacy value like + # Lib/sha.py and Lib/md5.py have. + _warnings.warn('block_size of %d seems too small; using our ' + 'default of %d.' % (blocksize, self.blocksize), + RuntimeWarning, 2) + blocksize = self.blocksize + else: + _warnings.warn('No block_size attribute on given digest object; ' + 'Assuming %d.' % (self.blocksize), + RuntimeWarning, 2) + blocksize = self.blocksize + if len(key) > blocksize: key = self.digest_cons(key).digest() Modified: python/trunk/Lib/test/test_hmac.py ============================================================================== --- python/trunk/Lib/test/test_hmac.py (original) +++ python/trunk/Lib/test/test_hmac.py Tue Nov 6 01:19:03 2007 @@ -1,6 +1,7 @@ import hmac -from hashlib import sha1 +import hashlib import unittest +import warnings from test import test_support class TestVectorsTestCase(unittest.TestCase): @@ -43,7 +44,7 @@ def test_sha_vectors(self): def shatest(key, data, digest): - h = hmac.HMAC(key, data, digestmod=sha1) + h = hmac.HMAC(key, data, digestmod=hashlib.sha1) self.assertEqual(h.hexdigest().upper(), digest.upper()) shatest(chr(0x0b) * 20, @@ -75,6 +76,161 @@ "and Larger Than One Block-Size Data"), "e8e99d0f45237d786d6bbaa7965c7808bbff1a91") + def _rfc4231_test_cases(self, hashfunc): + def hmactest(key, data, hexdigests): + h = hmac.HMAC(key, data, digestmod=hashfunc) + self.assertEqual(h.hexdigest().lower(), hexdigests[hashfunc]) + + # 4.2. Test Case 1 + hmactest(key = '\x0b'*20, + data = 'Hi There', + hexdigests = { + hashlib.sha224: '896fb1128abbdf196832107cd49df33f' + '47b4b1169912ba4f53684b22', + hashlib.sha256: 'b0344c61d8db38535ca8afceaf0bf12b' + '881dc200c9833da726e9376c2e32cff7', + hashlib.sha384: 'afd03944d84895626b0825f4ab46907f' + '15f9dadbe4101ec682aa034c7cebc59c' + 'faea9ea9076ede7f4af152e8b2fa9cb6', + hashlib.sha512: '87aa7cdea5ef619d4ff0b4241a1d6cb0' + '2379f4e2ce4ec2787ad0b30545e17cde' + 'daa833b7d6b8a702038b274eaea3f4e4' + 'be9d914eeb61f1702e696c203a126854', + }) + + # 4.3. Test Case 2 + hmactest(key = 'Jefe', + data = 'what do ya want for nothing?', + hexdigests = { + hashlib.sha224: 'a30e01098bc6dbbf45690f3a7e9e6d0f' + '8bbea2a39e6148008fd05e44', + hashlib.sha256: '5bdcc146bf60754e6a042426089575c7' + '5a003f089d2739839dec58b964ec3843', + hashlib.sha384: 'af45d2e376484031617f78d2b58a6b1b' + '9c7ef464f5a01b47e42ec3736322445e' + '8e2240ca5e69e2c78b3239ecfab21649', + hashlib.sha512: '164b7a7bfcf819e2e395fbe73b56e0a3' + '87bd64222e831fd610270cd7ea250554' + '9758bf75c05a994a6d034f65f8f0e6fd' + 'caeab1a34d4a6b4b636e070a38bce737', + }) + + # 4.4. Test Case 3 + hmactest(key = '\xaa'*20, + data = '\xdd'*50, + hexdigests = { + hashlib.sha224: '7fb3cb3588c6c1f6ffa9694d7d6ad264' + '9365b0c1f65d69d1ec8333ea', + hashlib.sha256: '773ea91e36800e46854db8ebd09181a7' + '2959098b3ef8c122d9635514ced565fe', + hashlib.sha384: '88062608d3e6ad8a0aa2ace014c8a86f' + '0aa635d947ac9febe83ef4e55966144b' + '2a5ab39dc13814b94e3ab6e101a34f27', + hashlib.sha512: 'fa73b0089d56a284efb0f0756c890be9' + 'b1b5dbdd8ee81a3655f83e33b2279d39' + 'bf3e848279a722c806b485a47e67c807' + 'b946a337bee8942674278859e13292fb', + }) + + # 4.5. Test Case 4 + hmactest(key = ''.join([chr(x) for x in xrange(0x01, 0x19+1)]), + data = '\xcd'*50, + hexdigests = { + hashlib.sha224: '6c11506874013cac6a2abc1bb382627c' + 'ec6a90d86efc012de7afec5a', + hashlib.sha256: '82558a389a443c0ea4cc819899f2083a' + '85f0faa3e578f8077a2e3ff46729665b', + hashlib.sha384: '3e8a69b7783c25851933ab6290af6ca7' + '7a9981480850009cc5577c6e1f573b4e' + '6801dd23c4a7d679ccf8a386c674cffb', + hashlib.sha512: 'b0ba465637458c6990e5a8c5f61d4af7' + 'e576d97ff94b872de76f8050361ee3db' + 'a91ca5c11aa25eb4d679275cc5788063' + 'a5f19741120c4f2de2adebeb10a298dd', + }) + + # 4.7. Test Case 6 + hmactest(key = '\xaa'*131, + data = 'Test Using Larger Than Block-Siz' + 'e Key - Hash Key First', + hexdigests = { + hashlib.sha224: '95e9a0db962095adaebe9b2d6f0dbce2' + 'd499f112f2d2b7273fa6870e', + hashlib.sha256: '60e431591ee0b67f0d8a26aacbf5b77f' + '8e0bc6213728c5140546040f0ee37f54', + hashlib.sha384: '4ece084485813e9088d2c63a041bc5b4' + '4f9ef1012a2b588f3cd11f05033ac4c6' + '0c2ef6ab4030fe8296248df163f44952', + hashlib.sha512: '80b24263c7c1a3ebb71493c1dd7be8b4' + '9b46d1f41b4aeec1121b013783f8f352' + '6b56d037e05f2598bd0fd2215d6a1e52' + '95e64f73f63f0aec8b915a985d786598', + }) + + # 4.8. Test Case 7 + hmactest(key = '\xaa'*131, + data = 'This is a test using a larger th' + 'an block-size key and a larger t' + 'han block-size data. The key nee' + 'ds to be hashed before being use' + 'd by the HMAC algorithm.', + hexdigests = { + hashlib.sha224: '3a854166ac5d9f023f54d517d0b39dbd' + '946770db9c2b95c9f6f565d1', + hashlib.sha256: '9b09ffa71b942fcb27635fbcd5b0e944' + 'bfdc63644f0713938a7f51535c3a35e2', + hashlib.sha384: '6617178e941f020d351e2f254e8fd32c' + '602420feb0b8fb9adccebb82461e99c5' + 'a678cc31e799176d3860e6110c46523e', + hashlib.sha512: 'e37b6a775dc87dbaa4dfa9f96e5e3ffd' + 'debd71f8867289865df5a32d20cdc944' + 'b6022cac3c4982b10d5eeb55c3e4de15' + '134676fb6de0446065c97440fa8c6a58', + }) + + def test_sha224_rfc4231(self): + self._rfc4231_test_cases(hashlib.sha224) + + def test_sha256_rfc4231(self): + self._rfc4231_test_cases(hashlib.sha256) + + def test_sha384_rfc4231(self): + self._rfc4231_test_cases(hashlib.sha384) + + def test_sha512_rfc4231(self): + self._rfc4231_test_cases(hashlib.sha512) + + def test_legacy_block_size_warnings(self): + class MockCrazyHash(object): + """Ain't no block_size attribute here.""" + def __init__(self, *args): + self._x = hashlib.sha1(*args) + self.digest_size = self._x.digest_size + def update(self, v): + self._x.update(v) + def digest(self): + return self._x.digest() + + warnings.simplefilter('error', RuntimeWarning) + try: + try: + hmac.HMAC('a', 'b', digestmod=MockCrazyHash) + except RuntimeWarning: + pass + else: + self.fail('Expected warning about missing block_size') + + MockCrazyHash.block_size = 1 + try: + hmac.HMAC('a', 'b', digestmod=MockCrazyHash) + except RuntimeWarning: + pass + else: + self.fail('Expected warning about small block_size') + finally: + warnings.resetwarnings() + + class ConstructorTestCase(unittest.TestCase): @@ -95,9 +251,8 @@ def test_withmodule(self): # Constructor call with text and digest module. - from hashlib import sha1 try: - h = hmac.HMAC("key", "", sha1) + h = hmac.HMAC("key", "", hashlib.sha1) except: self.fail("Constructor call with hashlib.sha1 raised exception.") @@ -106,7 +261,6 @@ def test_default_is_md5(self): # Testing if HMAC defaults to MD5 algorithm. # NOTE: this whitebox test depends on the hmac class internals - import hashlib h = hmac.HMAC("key") self.failUnless(h.digest_cons == hashlib.md5) Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Tue Nov 6 01:19:03 2007 @@ -364,6 +364,9 @@ - md5 now raises a DeprecationWarning upon import. +- Issue1385: The hmac module now computes the correct hmac when using hashes + with a block size other than 64 bytes (such as sha384 and sha512). + - mimify now raises a DeprecationWarning upon import. - MimeWriter now raises a DeprecationWarning upon import.

1 0

buildbot failure in hppa Ubuntu 3.0
by buildbot＠python.org 05 Nov '07

05 Nov '07

The Buildbot has detected a new failure of hppa Ubuntu 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/hppa%20Ubuntu%203.0/builds/188 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-ubuntu-hppa Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: guido.van.rossum BUILD FAILED: failed test Excerpt from the test logfile: make: *** [buildbottest] Unknown signal 37 sincerely, -The Buildbot

1 0

r58857 - python/trunk/Doc/library/zipfile.rst
by mark.summerfield 05 Nov '07

05 Nov '07

Author: mark.summerfield Date: Mon Nov 5 15:38:50 2007 New Revision: 58857 Modified: python/trunk/Doc/library/zipfile.rst Log: Clarified the fact that you can have comments for individual archive members even though comments to the archive itself aren't currently supported. Modified: python/trunk/Doc/library/zipfile.rst ============================================================================== --- python/trunk/Doc/library/zipfile.rst (original) +++ python/trunk/Doc/library/zipfile.rst Mon Nov 5 15:38:50 2007 @@ -18,11 +18,13 @@ defined in `PKZIP Application Note <http://www.pkware.com/business_and_developers/developer/appnote/>`_. -This module does not currently handle ZIP files which have appended comments, or -multi-disk ZIP files. It can handle ZIP files that use the ZIP64 extensions -(that is ZIP files that are more than 4 GByte in size). It supports decryption -of encrypted files in ZIP archives, but it currently cannot create an encrypted -file. +This module does not currently handle multi-disk ZIP files, or ZIP files +which have appended comments (although it correctly handles comments +added to individual archive members---for which see the :ref:`zipinfo-objects` +documentation). It can handle ZIP files that use the ZIP64 extensions +(that is ZIP files that are more than 4 GByte in size). It supports +decryption of encrypted files in ZIP archives, but it currently cannot +create an encrypted file. For other archive formats, see the :mod:`bz2`, :mod:`gzip`, and :mod:`tarfile` modules.

1 0

r58854 - python/trunk/Doc/library/bz2.rst python/trunk/Doc/library/gzip.rst python/trunk/Doc/library/tarfile.rst python/trunk/Doc/library/zipfile.rst python/trunk/Doc/library/zlib.rst
by mark.summerfield 05 Nov '07

05 Nov '07

Author: mark.summerfield Date: Mon Nov 5 10:22:48 2007 New Revision: 58854 Modified: python/trunk/Doc/library/bz2.rst python/trunk/Doc/library/gzip.rst python/trunk/Doc/library/tarfile.rst python/trunk/Doc/library/zipfile.rst python/trunk/Doc/library/zlib.rst Log: Added cross-references between the various archive file formats. Modified: python/trunk/Doc/library/bz2.rst ============================================================================== --- python/trunk/Doc/library/bz2.rst (original) +++ python/trunk/Doc/library/bz2.rst Mon Nov 5 10:22:48 2007 @@ -14,7 +14,10 @@ It implements a complete file interface, one-shot (de)compression functions, and types for sequential (de)compression. -Here is a resume of the features offered by the bz2 module: +For other archive formats, see the :mod:`gzip`, :mod:`zipfile`, and +:mod:`tarfile` modules. + +Here is a summary of the features offered by the bz2 module: * :class:`BZ2File` class implements a complete file interface, including :meth:`readline`, :meth:`readlines`, :meth:`writelines`, :meth:`seek`, etc; @@ -32,9 +35,7 @@ * One-shot (de)compression supported by :func:`compress` and :func:`decompress` functions; -* Thread safety uses individual locking mechanism; - -* Complete inline documentation; +* Thread safety uses individual locking mechanism. (De)compression of files Modified: python/trunk/Doc/library/gzip.rst ============================================================================== --- python/trunk/Doc/library/gzip.rst (original) +++ python/trunk/Doc/library/gzip.rst Mon Nov 5 10:22:48 2007 @@ -15,6 +15,9 @@ programs, such as those produced by :program:`compress` and :program:`pack`, are not supported by this module. +For other archive formats, see the :mod:`bz2`, :mod:`zipfile`, and +:mod:`tarfile` modules. + The module defines the following items: Modified: python/trunk/Doc/library/tarfile.rst ============================================================================== --- python/trunk/Doc/library/tarfile.rst (original) +++ python/trunk/Doc/library/tarfile.rst Mon Nov 5 10:22:48 2007 @@ -13,10 +13,13 @@ .. sectionauthor:: Lars Gustäbel <lars(a)gustaebel.de> -The :mod:`tarfile` module makes it possible to read and create tar archives. +The :mod:`tarfile` module makes it possible to read and write tar +archives, including those using gzip or bz2 compression. +(`.zip` files can be read and written using the :mod:`zipfile` module.) + Some facts and figures: -* reads and writes :mod:`gzip` and :mod:`bzip2` compressed archives. +* reads and writes :mod:`gzip` and :mod:`bz2` compressed archives. * read/write support for the POSIX.1-1988 (ustar) format. Modified: python/trunk/Doc/library/zipfile.rst ============================================================================== --- python/trunk/Doc/library/zipfile.rst (original) +++ python/trunk/Doc/library/zipfile.rst Mon Nov 5 10:22:48 2007 @@ -21,11 +21,13 @@ This module does not currently handle ZIP files which have appended comments, or multi-disk ZIP files. It can handle ZIP files that use the ZIP64 extensions (that is ZIP files that are more than 4 GByte in size). It supports decryption -of encrypted files in ZIP archives, but it cannot currently create an encrypted +of encrypted files in ZIP archives, but it currently cannot create an encrypted file. -The available attributes of this module are: +For other archive formats, see the :mod:`bz2`, :mod:`gzip`, and +:mod:`tarfile` modules. +The module defines the following items: .. exception:: BadZipfile Modified: python/trunk/Doc/library/zlib.rst ============================================================================== --- python/trunk/Doc/library/zlib.rst (original) +++ python/trunk/Doc/library/zlib.rst Mon Nov 5 10:22:48 2007 @@ -19,6 +19,10 @@ consult the zlib manual at http://www.zlib.net/manual.html for authoritative information. +For reading and writing ``.gz`` files see the :mod:`gzip` module. For +other archive formats, see the :mod:`bz2`, :mod:`zipfile`, and +:mod:`tarfile` modules. + The available exception and functions in this module are:

1 0

r58853 - python/trunk/Lib/bsddb/test/test_misc.py
by gregory.p.smith 05 Nov '07

05 Nov '07

Author: gregory.p.smith Date: Mon Nov 5 10:07:40 2007 New Revision: 58853 Modified: python/trunk/Lib/bsddb/test/test_misc.py Log: * db->get_flags is only available in BerkeleyDB >= 4.2 Modified: python/trunk/Lib/bsddb/test/test_misc.py ============================================================================== --- python/trunk/Lib/bsddb/test/test_misc.py (original) +++ python/trunk/Lib/bsddb/test/test_misc.py Mon Nov 5 10:07:40 2007 @@ -91,6 +91,10 @@ os.unlink(self.filename) def test_DB_set_flags_persists(self): + if db.version() < (4,2): + # The get_flags API required for this to work is only available + # in BerkeleyDB >= 4.2 + return try: db1 = db.DB() db1.set_flags(db.DB_DUPSORT)

1 0

r58852 - python/trunk/Modules/_bsddb.c
by gregory.p.smith 05 Nov '07

05 Nov '07

Author: gregory.p.smith Date: Mon Nov 5 10:06:28 2007 New Revision: 58852 Modified: python/trunk/Modules/_bsddb.c Log: * db->get_types is only available in BerkeleyDB >= 4.2 * get compiling with older versions of python again for a stand alone release. Modified: python/trunk/Modules/_bsddb.c ============================================================================== --- python/trunk/Modules/_bsddb.c (original) +++ python/trunk/Modules/_bsddb.c Mon Nov 5 10:06:28 2007 @@ -203,6 +203,11 @@ staticforward PyTypeObject DB_Type, DBCursor_Type, DBEnv_Type, DBTxn_Type, DBLock_Type; +#ifndef Py_Type +/* for compatibility with Python 2.5 and earlier */ +#define Py_Type(ob) (((PyObject*)(ob))->ob_type) +#endif + #define DBObject_Check(v) (Py_Type(v) == &DB_Type) #define DBCursorObject_Check(v) (Py_Type(v) == &DBCursor_Type) #define DBEnvObject_Check(v) (Py_Type(v) == &DBEnv_Type) @@ -1849,7 +1854,9 @@ return NULL; } +#if (DBVER >= 42) self->db->get_flags(self->db, &self->setflags); +#endif self->flags = flags; RETURN_NONE();

1 0

buildbot failure in PPC64 Debian trunk
by buildbot＠python.org 04 Nov '07

04 Nov '07

The Buildbot has detected a new failure of PPC64 Debian trunk. Full details are available at: http://www.python.org/dev/buildbot/all/PPC64%20Debian%20trunk/builds/311 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-ppc64 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: gregory.p.smith BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_xmlrpc ====================================================================== ERROR: test_fail_no_info (test.test_xmlrpc.FailingServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/test/test_xmlrpc.py", line 497, in test_fail_no_info p.pow(6,8) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1157, in __call__ return self.__send(self.__name, args) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1447, in __request verbose=self.__verbose File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1195, in request errcode, errmsg, headers = h.getreply() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 1006, in getreply response = self._conn.getresponse() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 932, in getresponse response.begin() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 415, in begin self.msg = HTTPMessage(self.fp, 0) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/mimetools.py", line 16, in __init__ rfc822.Message.__init__(self, fp, seekable) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/rfc822.py", line 104, in __init__ self.readheaders() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 271, in readheaders line = self.fp.readline() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/socket.py", line 351, in readline data = recv(1) error: [Errno 104] Connection reset by peer ====================================================================== ERROR: test_fail_with_info (test.test_xmlrpc.FailingServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/test/test_xmlrpc.py", line 517, in test_fail_with_info p.pow(6,8) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1157, in __call__ return self.__send(self.__name, args) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1447, in __request verbose=self.__verbose File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/xmlrpclib.py", line 1195, in request errcode, errmsg, headers = h.getreply() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 1006, in getreply response = self._conn.getresponse() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 932, in getresponse response.begin() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 415, in begin self.msg = HTTPMessage(self.fp, 0) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/mimetools.py", line 16, in __init__ rfc822.Message.__init__(self, fp, seekable) File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/rfc822.py", line 104, in __init__ self.readheaders() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/httplib.py", line 271, in readheaders line = self.fp.readline() File "/home/pybot/buildarea64/trunk.klose-debian-ppc64/build/Lib/socket.py", line 351, in readline data = recv(1) error: [Errno 104] Connection reset by peer make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in ppc Debian unstable trunk
by buildbot＠python.org 04 Nov '07

04 Nov '07

The Buildbot has detected a new failure of ppc Debian unstable trunk. Full details are available at: http://www.python.org/dev/buildbot/all/ppc%20Debian%20unstable%20trunk/buil… Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-ppc Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: gregory.p.smith BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_xmlrpc ====================================================================== ERROR: test_fail_with_info (test.test_xmlrpc.FailingServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/test/test_xmlrpc.py", line 517, in test_fail_with_info p.pow(6,8) File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/xmlrpclib.py", line 1157, in __call__ return self.__send(self.__name, args) File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/xmlrpclib.py", line 1447, in __request verbose=self.__verbose File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/xmlrpclib.py", line 1195, in request errcode, errmsg, headers = h.getreply() File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/httplib.py", line 1006, in getreply response = self._conn.getresponse() File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/httplib.py", line 932, in getresponse response.begin() File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/httplib.py", line 415, in begin self.msg = HTTPMessage(self.fp, 0) File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/mimetools.py", line 16, in __init__ rfc822.Message.__init__(self, fp, seekable) File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/rfc822.py", line 104, in __init__ self.readheaders() File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/httplib.py", line 271, in readheaders line = self.fp.readline() File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/socket.py", line 351, in readline data = recv(1) error: [Errno 104] Connection reset by peer make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0