Mailman 3 April 2009 - Python-checkins

r72102 - python/branches/py3k/Lib/tokenize.py
by raymond.hettinger 29 Apr '09

29 Apr '09

Author: raymond.hettinger Date: Wed Apr 29 16:21:25 2009 New Revision: 72102 Log: Remove dependency on the collections module. Modified: python/branches/py3k/Lib/tokenize.py Modified: python/branches/py3k/Lib/tokenize.py ============================================================================== --- python/branches/py3k/Lib/tokenize.py (original) +++ python/branches/py3k/Lib/tokenize.py Wed Apr 29 16:21:25 2009 @@ -24,7 +24,6 @@ 'Skip Montanaro, Raymond Hettinger, Trent Nelson, ' 'Michael Foord') -import collections import re, string, sys from token import * from codecs import lookup, BOM_UTF8 @@ -32,7 +31,7 @@ import token __all__ = [x for x in dir(token) if x[0] != '_'] + ["COMMENT", "tokenize", - "detect_encoding", "NL", "untokenize", "ENCODING", "Tokenize"] + "detect_encoding", "NL", "untokenize", "ENCODING", "TokenInfo"] del token COMMENT = N_TOKENS @@ -43,7 +42,46 @@ tok_name[ENCODING] = 'ENCODING' N_TOKENS += 3 -TokenInfo = collections.namedtuple('TokenInfo', 'type string start end line') +class TokenInfo(tuple): + 'TokenInfo(type, string, start, end, line)' + + __slots__ = () + + _fields = ('type', 'string', 'start', 'end', 'line') + + def __new__(cls, type, string, start, end, line): + return tuple.__new__(cls, (type, string, start, end, line)) + + @classmethod + def _make(cls, iterable, new=tuple.__new__, len=len): + 'Make a new TokenInfo object from a sequence or iterable' + result = new(cls, iterable) + if len(result) != 5: + raise TypeError('Expected 5 arguments, got %d' % len(result)) + return result + + def __repr__(self): + return 'TokenInfo(type=%r, string=%r, start=%r, end=%r, line=%r)' % self + + def _asdict(self): + 'Return a new dict which maps field names to their values' + return dict(zip(self._fields, self)) + + def _replace(self, **kwds): + 'Return a new TokenInfo object replacing specified fields with new values' + result = self._make(map(kwds.pop, ('type', 'string', 'start', 'end', 'line'), self)) + if kwds: + raise ValueError('Got unexpected field names: %r' % kwds.keys()) + return result + + def __getnewargs__(self): + return tuple(self) + + type = property(lambda t: t[0]) + string = property(lambda t: t[1]) + start = property(lambda t: t[2]) + end = property(lambda t: t[3]) + line = property(lambda t: t[4]) def group(*choices): return '(' + '|'.join(choices) + ')' def any(*choices): return group(*choices) + '*'

1 0

buildbot failure in ppc Debian unstable trunk
by buildbot＠python.org 29 Apr '09

29 Apr '09

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: r.david.murray BUILD FAILED: failed test Excerpt from the test logfile: Traceback (most recent call last): File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/threading.py", line 524, in __bootstrap_inner self.run() File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/threading.py", line 477, in run self.__target(*self.__args, **self.__kwargs) File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/bsddb/test/test_thread.py", line 306, in readerThread rec = dbutils.DeadlockWrap(c.next, max_retries=10) File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/bsddb/dbutils.py", line 68, in DeadlockWrap return function(*_args, **_kwargs) DBLockDeadlockError: (-30994, 'DB_LOCK_DEADLOCK: Locker killed to resolve a deadlock') 1 test failed: test_time make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in sparc solaris10 gcc 3.0
by buildbot＠python.org 29 Apr '09

29 Apr '09

The Buildbot has detected a new failure of sparc solaris10 gcc 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20solaris10%20gcc%203.0/builds… Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: loewis-sun Build Reason: Build Source Stamp: [branch branches/release30-maint] HEAD Blamelist: eric.smith BUILD FAILED: failed test Excerpt from the test logfile: 2 tests failed: test_posix test_subprocess ====================================================================== ERROR: test_getcwd_long_pathnames (test.test_posix.PosixTester) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/test/test_posix.py", line 252, in test_getcwd_long_pathnames support.rmtree(base_path) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/test/support.py", line 98, in rmtree shutil.rmtree(path) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/shutil.py", line 225, in rmtree onerror(os.rmdir, path, sys.exc_info()) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/shutil.py", line 223, in rmtree os.rmdir(path) OSError: [Errno 22] Invalid argument: '/home2/buildbot/slave/3.0.loewis-sun/build/@test.getcwd/@test.getcwd' ====================================================================== FAIL: test_executable (test.test_subprocess.ProcessTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/test/test_subprocess.py", line 115, in test_executable self.assertEqual(p.returncode, 47) AssertionError: -6 != 47 sincerely, -The Buildbot

1 0

r72101 - python/trunk/Lib/test/test_aifc.py
by r.david.murray 29 Apr '09

29 Apr '09

Author: r.david.murray Date: Wed Apr 29 15:51:44 2009 New Revision: 72101 Log: Now that we've got a test_aifc, add a few tests. Modified: python/trunk/Lib/test/test_aifc.py Modified: python/trunk/Lib/test/test_aifc.py ============================================================================== --- python/trunk/Lib/test/test_aifc.py (original) +++ python/trunk/Lib/test/test_aifc.py Wed Apr 29 15:51:44 2009 @@ -15,6 +15,36 @@ f = aifc.open(self.sndfilepath) f.close() + def test_params(self): + f = aifc.open(self.sndfilepath) + self.assertEqual(f.getnchannels(), 2) + self.assertEqual(f.getsampwidth(), 2) + self.assertEqual(f.getframerate(), 48000) + self.assertEqual(f.getnframes(), 14400) + self.assertEqual(f.getcomptype(), 'NONE') + self.assertEqual(f.getcompname(), 'not compressed') + self.assertEqual(f.getparams(), (2, 2, 48000, 14400, 'NONE', 'not compressed')) + f.close() + + def test_read(self): + f = aifc.open(self.sndfilepath) + self.assertEqual(f.tell(), 0) + self.assertEqual(f.readframes(2), '\x00\x00\x00\x00\x0b\xd4\x0b\xd4') + f.rewind() + pos0 = f.tell() + self.assertEqual(pos0, 0) + self.assertEqual(f.readframes(2), '\x00\x00\x00\x00\x0b\xd4\x0b\xd4') + pos2 = f.tell() + self.assertEqual(pos2, 2) + self.assertEqual(f.readframes(2), '\x17t\x17t"\xad"\xad') + f.setpos(pos2) + self.assertEqual(f.readframes(2), '\x17t\x17t"\xad"\xad') + f.setpos(pos0) + self.assertEqual(f.readframes(2), '\x00\x00\x00\x00\x0b\xd4\x0b\xd4') + f.close() + + #XXX Need more tests! + def test_main(): run_unittest(AIFCTest)

1 0

buildbot failure in x86 gentoo trunk
by buildbot＠python.org 29 Apr '09

29 Apr '09

The Buildbot has detected a new failure of x86 gentoo trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20gentoo%20trunk/builds/4895 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: norwitz-x86 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: r.david.murray BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_os ====================================================================== FAIL: test_update2 (test.test_os.EnvironTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/buildslave/python-trunk/trunk.norwitz-x86/build/Lib/test/test_os.py", line 348, in test_update2 self.assertEquals(value, "World") AssertionError: '' != 'World' make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in ia64 Ubuntu 3.0
by buildbot＠python.org 29 Apr '09

29 Apr '09

The Buildbot has detected a new failure of ia64 Ubuntu 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/ia64%20Ubuntu%203.0/builds/321 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-ia64 Build Reason: Build Source Stamp: [branch branches/release30-maint] HEAD Blamelist: eric.smith BUILD FAILED: failed failed slave lost sincerely, -The Buildbot

1 0

r72100 - in python/trunk: Lib/aifc.py Lib/test/Sine-1000Hz-300ms.aif Lib/test/test_aifc.py Lib/test/test_sundry.py Misc/ACKS Misc/NEWS
by r.david.murray 29 Apr '09

29 Apr '09

Author: r.david.murray Date: Wed Apr 29 15:17:37 2009 New Revision: 72100 Log: Fix issue 2245. aifc now skips any chunk type it doesn't actually process instead of throwing errors for anything not in an explicit skip list. This is per this spec: http://www.cnpbagwell.com/aiff-c.txt. Spec reference and test sound file provided by Santiago Peresón, fix based on patch by Hiroaki Kawai. Added: python/trunk/Lib/test/Sine-1000Hz-300ms.aif (contents, props changed) python/trunk/Lib/test/test_aifc.py Modified: python/trunk/Lib/aifc.py python/trunk/Lib/test/test_sundry.py python/trunk/Misc/ACKS python/trunk/Misc/NEWS Modified: python/trunk/Lib/aifc.py ============================================================================== --- python/trunk/Lib/aifc.py (original) +++ python/trunk/Lib/aifc.py Wed Apr 29 15:17:37 2009 @@ -144,9 +144,6 @@ _AIFC_version = 0xA2805140L # Version 1 of AIFF-C -_skiplist = 'COMT', 'INST', 'MIDI', 'AESD', \ - 'APPL', 'NAME', 'AUTH', '(c) ', 'ANNO' - def _read_long(file): try: return struct.unpack('>l', file.read(4))[0] @@ -314,10 +311,6 @@ self._version = _read_ulong(chunk) elif chunkname == 'MARK': self._readmark(chunk) - elif chunkname in _skiplist: - pass - else: - raise Error, 'unrecognized chunk type '+chunk.chunkname chunk.skip() if not self._comm_chunk_read or not self._ssnd_chunk: raise Error, 'COMM chunk and/or SSND chunk missing' Added: python/trunk/Lib/test/Sine-1000Hz-300ms.aif ============================================================================== Binary file. No diff available. Added: python/trunk/Lib/test/test_aifc.py ============================================================================== --- (empty file) +++ python/trunk/Lib/test/test_aifc.py Wed Apr 29 15:17:37 2009 @@ -0,0 +1,24 @@ +from test.test_support import findfile, run_unittest +import unittest + +import aifc + + +class AIFCTest(unittest.TestCase): + + def setUp(self): + self.sndfilepath = findfile('Sine-1000Hz-300ms.aif') + + def test_skipunknown(self): + #Issue 2245 + #This file contains chunk types aifc doesn't recognize. + f = aifc.open(self.sndfilepath) + f.close() + + +def test_main(): + run_unittest(AIFCTest) + + +if __name__ == "__main__": + unittest.main() Modified: python/trunk/Lib/test/test_sundry.py ============================================================================== --- python/trunk/Lib/test/test_sundry.py (original) +++ python/trunk/Lib/test/test_sundry.py Wed Apr 29 15:17:37 2009 @@ -11,7 +11,6 @@ with warnings.catch_warnings(): warnings.simplefilter("ignore") import CGIHTTPServer - import aifc import audiodev import bdb import cgitb Modified: python/trunk/Misc/ACKS ============================================================================== --- python/trunk/Misc/ACKS (original) +++ python/trunk/Misc/ACKS Wed Apr 29 15:17:37 2009 @@ -370,6 +370,7 @@ Peter van Kampen Jacob Kaplan-Moss Lou Kates +Hiroaki Kawai Sebastien Keim Robert Kern Randall Kern @@ -541,6 +542,7 @@ Samuele Pedroni Marcel van der Peijl Steven Pemberton +Santiago Peres�n Mark Perrego Trevor Perrin Tim Peters Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Wed Apr 29 15:17:37 2009 @@ -255,6 +255,8 @@ Library ------- +- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. + - Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive anymore.

1 0

buildbot failure in x86 XP-4 3.x
by buildbot＠python.org 29 Apr '09

29 Apr '09

The Buildbot has detected a new failure of x86 XP-4 3.x. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP-4%203.x/builds/513 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: bolen-windows Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: georg.brandl,tarek.ziade BUILD FAILED: failed test Excerpt from the test logfile: 3 tests failed: test___all__ test__locale test_cprofile ====================================================================== ERROR: test_all (test.test___all__.AllTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.x.bolen-windows\build\lib\test\test___all__.py", line 135, in test_all self.check_all("tokenize") File "E:\cygwin\home\db3l\buildarea\3.x.bolen-windows\build\lib\test\test___all__.py", line 23, in check_all exec("from %s import *" % modname, names) File "<string>", line 1, in <module> AttributeError: 'module' object has no attribute 'Tokenize' Traceback (most recent call last): File "../lib/test/regrtest.py", line 613, in runtest_inner the_package = __import__(abstest, globals(), locals(), []) File "E:\cygwin\home\db3l\buildarea\3.x.bolen-windows\build\lib\test\test__locale.py", line 2, in <module> from _locale import (setlocale, LC_ALL, LC_CTYPE, LC_NUMERIC, RADIXCHAR, THOUSEP, nl_langinfo, ImportError: cannot import name RADIXCHAR sincerely, -The Buildbot

1 0

r72099 - python/branches/release30-maint
by eric.smith 29 Apr '09

29 Apr '09

Author: eric.smith Date: Wed Apr 29 14:38:15 2009 New Revision: 72099 Log: Blocked revisions 72098 via svnmerge ........ r72098 | eric.smith | 2009-04-29 08:34:19 -0400 (Wed, 29 Apr 2009) | 1 line Added test that didn't make it in an svnmerge. ........ Modified: python/branches/release30-maint/ (props changed)

1 0

r72098 - python/branches/py3k/Lib/test/test_ascii_formatd.py
by eric.smith 29 Apr '09

29 Apr '09

Author: eric.smith Date: Wed Apr 29 14:34:19 2009 New Revision: 72098 Log: Added test that didn't make it in an svnmerge. Added: python/branches/py3k/Lib/test/test_ascii_formatd.py Added: python/branches/py3k/Lib/test/test_ascii_formatd.py ============================================================================== --- (empty file) +++ python/branches/py3k/Lib/test/test_ascii_formatd.py Wed Apr 29 14:34:19 2009 @@ -0,0 +1,62 @@ +# PyOS_ascii_formatd is deprecated and not called from anywhere in +# Python itself. So this module is the only place it gets tested. +# Test that it works, and test that it's deprecated. + +import unittest +from test.support import check_warnings, run_unittest, cpython_only + +class FormatDeprecationTests(unittest.TestCase): + + @cpython_only + def testFormatDeprecation(self): + # delay importing ctypes until we know we're in CPython + from ctypes import (pythonapi, create_string_buffer, sizeof, byref, + c_double) + PyOS_ascii_formatd = pythonapi.PyOS_ascii_formatd + buf = create_string_buffer(100) + + with check_warnings() as w: + PyOS_ascii_formatd(byref(buf), sizeof(buf), b'%+.10f', + c_double(10.0)) + self.assertEqual(buf.value, b'+10.0000000000') + + self.assertEqual(str(w.message), 'PyOS_ascii_formatd is deprecated, ' + 'use PyOS_double_to_string instead') + +class FormatTests(unittest.TestCase): + # ensure that, for the restricted set of format codes, + # %-formatting returns the same values os PyOS_ascii_formatd + @cpython_only + def testFormat(self): + # delay importing ctypes until we know we're in CPython + from ctypes import (pythonapi, create_string_buffer, sizeof, byref, + c_double) + PyOS_ascii_formatd = pythonapi.PyOS_ascii_formatd + buf = create_string_buffer(100) + + tests = [ + ('%f', 100.0), + ('%g', 100.0), + ('%#g', 100.0), + ('%#.2g', 100.0), + ('%#.2g', 123.4567), + ('%#.2g', 1.234567e200), + ('%e', 1.234567e200), + ('%e', 1.234), + ('%+e', 1.234), + ('%-e', 1.234), + ] + + with check_warnings(): + for format, val in tests: + PyOS_ascii_formatd(byref(buf), sizeof(buf), + bytes(format, 'ascii'), + c_double(val)) + self.assertEqual(buf.value, bytes(format % val, 'ascii')) + + +def test_main(): + run_unittest(FormatDeprecationTests, FormatTests) + +if __name__ == '__main__': + test_main()

1 0