Mailman 3 April 2009 - Python-checkins

r72122 - python/branches/release30-maint
by r.david.murray 29 Apr '09

29 Apr '09

Author: r.david.murray Date: Wed Apr 29 22:44:57 2009 New Revision: 72122 Log: Blocked revisions 72118 via svnmerge ................ r72118 | r.david.murray | 2009-04-29 16:40:42 -0400 (Wed, 29 Apr 2009) | 9 lines Merged revisions 72115 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72115 | r.david.murray | 2009-04-29 16:15:18 -0400 (Wed, 29 Apr 2009) | 2 lines More aifc tests. ........ ................ Test uses unittest method that wasn't backported. Modified: python/branches/release30-maint/ (props changed)

1 0

r72121 - python/branches/py3k
by mark.dickinson 29 Apr '09

29 Apr '09

Author: mark.dickinson Date: Wed Apr 29 22:43:11 2009 New Revision: 72121 Log: Blocked revisions 72119 via svnmerge ........ r72119 | mark.dickinson | 2009-04-29 21:41:00 +0100 (Wed, 29 Apr 2009) | 3 lines Issue #5864: format(1234.5, '.4') gives misleading result (Backport of r72109 from py3k.) ........ Modified: python/branches/py3k/ (props changed)

1 0

r72120 - python/branches/release26-maint
by mark.dickinson 29 Apr '09

29 Apr '09

Author: mark.dickinson Date: Wed Apr 29 22:41:53 2009 New Revision: 72120 Log: Blocked revisions 72119 via svnmerge ........ r72119 | mark.dickinson | 2009-04-29 21:41:00 +0100 (Wed, 29 Apr 2009) | 3 lines Issue #5864: format(1234.5, '.4') gives misleading result (Backport of r72109 from py3k.) ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r72119 - in python/trunk: Lib/test/test_float.py Misc/NEWS Python/pystrtod.c
by mark.dickinson 29 Apr '09

29 Apr '09

Author: mark.dickinson Date: Wed Apr 29 22:41:00 2009 New Revision: 72119 Log: Issue #5864: format(1234.5, '.4') gives misleading result (Backport of r72109 from py3k.) Modified: python/trunk/Lib/test/test_float.py python/trunk/Misc/NEWS python/trunk/Python/pystrtod.c Modified: python/trunk/Lib/test/test_float.py ============================================================================== --- python/trunk/Lib/test/test_float.py (original) +++ python/trunk/Lib/test/test_float.py Wed Apr 29 22:41:00 2009 @@ -253,6 +253,11 @@ self.assertEquals(math.atan2(float('-1e-1000'), -1), math.atan2(-0.0, -1)) + def test_issue5864(self): + self.assertEquals(format(123.456, '.4'), '123.5') + self.assertEquals(format(1234.56, '.4'), '1.235e+03') + self.assertEquals(format(12345.6, '.4'), '1.235e+04') + class ReprTestCase(unittest.TestCase): def test_repr(self): floats_file = open(os.path.join(os.path.split(__file__)[0], Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Wed Apr 29 22:41:00 2009 @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #5864: Fix empty format code formatting for floats so that it + never gives more than the requested number of significant digits. + - Issue #5793: Rationalize isdigit / isalpha / tolower, etc. Includes new Py_ISDIGIT / Py_ISALPHA / Py_TOLOWER, etc. in pctypes.h. Modified: python/trunk/Python/pystrtod.c ============================================================================== --- python/trunk/Python/pystrtod.c (original) +++ python/trunk/Python/pystrtod.c Wed Apr 29 22:41:00 2009 @@ -348,14 +348,61 @@ } } -/* Ensure that buffer has a decimal point in it. The decimal point will not - be in the current locale, it will always be '.'. Don't add a decimal if an - exponent is present. */ +/* Remove trailing zeros after the decimal point from a numeric string; also + remove the decimal point if all digits following it are zero. The numeric + string must end in '\0', and should not have any leading or trailing + whitespace. Assumes that the decimal point is '.'. */ Py_LOCAL_INLINE(void) -ensure_decimal_point(char* buffer, size_t buf_size) +remove_trailing_zeros(char *buffer) +{ + char *old_fraction_end, *new_fraction_end, *end, *p; + + p = buffer; + if (*p == '-' || *p == '+') + /* Skip leading sign, if present */ + ++p; + while (Py_ISDIGIT(*p)) + ++p; + + /* if there's no decimal point there's nothing to do */ + if (*p++ != '.') + return; + + /* scan any digits after the point */ + while (Py_ISDIGIT(*p)) + ++p; + old_fraction_end = p; + + /* scan up to ending '\0' */ + while (*p != '\0') + p++; + /* +1 to make sure that we move the null byte as well */ + end = p+1; + + /* scan back from fraction_end, looking for removable zeros */ + p = old_fraction_end; + while (*(p-1) == '0') + --p; + /* and remove point if we've got that far */ + if (*(p-1) == '.') + --p; + new_fraction_end = p; + + memmove(new_fraction_end, old_fraction_end, end-old_fraction_end); +} + +/* Ensure that buffer has a decimal point in it. The decimal point will not + be in the current locale, it will always be '.'. Don't add a decimal point + if an exponent is present. Also, convert to exponential notation where + adding a '.0' would produce too many significant digits (see issue 5864). + + Returns a pointer to the fixed buffer, or NULL on failure. +*/ +Py_LOCAL_INLINE(char *) +ensure_decimal_point(char* buffer, size_t buf_size, int precision) { - int insert_count = 0; - char* chars_to_insert; + int digit_count, insert_count = 0, convert_to_exp = 0; + char* chars_to_insert, *digits_start; /* search for the first non-digit character */ char *p = buffer; @@ -363,8 +410,10 @@ /* Skip leading sign, if present. I think this could only ever be '-', but it can't hurt to check for both. */ ++p; + digits_start = p; while (*p && Py_ISDIGIT(*p)) ++p; + digit_count = Py_SAFE_DOWNCAST(p - digits_start, Py_ssize_t, int); if (*p == '.') { if (Py_ISDIGIT(*(p+1))) { @@ -374,6 +423,8 @@ else { /* We have a decimal point, but no following digit. Insert a zero after the decimal. */ + /* can't ever get here via PyOS_double_to_string */ + assert(precision == -1); ++p; chars_to_insert = "0"; insert_count = 1; @@ -381,8 +432,22 @@ } else if (!(*p == 'e' || *p == 'E')) { /* Don't add ".0" if we have an exponent. */ - chars_to_insert = ".0"; - insert_count = 2; + if (digit_count == precision) { + /* issue 5864: don't add a trailing .0 in the case + where the '%g'-formatted result already has as many + significant digits as were requested. Switch to + exponential notation instead. */ + convert_to_exp = 1; + /* no exponent, no point, and we shouldn't land here + for infs and nans, so we must be at the end of the + string. */ + assert(*p == '\0'); + } + else { + assert(precision == -1 || digit_count < precision); + chars_to_insert = ".0"; + insert_count = 2; + } } if (insert_count) { size_t buf_len = strlen(buffer); @@ -397,6 +462,30 @@ memcpy(p, chars_to_insert, insert_count); } } + if (convert_to_exp) { + int written; + size_t buf_avail; + p = digits_start; + /* insert decimal point */ + assert(digit_count >= 1); + memmove(p+2, p+1, digit_count); /* safe, but overwrites nul */ + p[1] = '.'; + p += digit_count+1; + assert(p <= buf_size+buffer); + buf_avail = buf_size+buffer-p; + if (buf_avail == 0) + return NULL; + /* Add exponent. It's okay to use lower case 'e': we only + arrive here as a result of using the empty format code or + repr/str builtins and those never want an upper case 'E' */ + written = PyOS_snprintf(p, buf_avail, "e%+.02d", digit_count-1); + if (!(0 <= written && + written < Py_SAFE_DOWNCAST(buf_avail, size_t, int))) + /* output truncated, or something else bad happened */ + return NULL; + remove_trailing_zeros(buffer); + } + return buffer; } /* see FORMATBUFLEN in unicodeobject.c */ @@ -419,6 +508,7 @@ * at least one digit after the decimal. * * Return value: The pointer to the buffer with the converted string. + * On failure returns NULL but does not set any Python exception. **/ /* DEPRECATED, will be deleted in 2.8 and 3.2 */ PyAPI_FUNC(char *) @@ -495,9 +585,12 @@ ensure_minimum_exponent_length(buffer, buf_size); /* If format_char is 'Z', make sure we have at least one character - after the decimal point (and make sure we have a decimal point). */ + after the decimal point (and make sure we have a decimal point); + also switch to exponential notation in some edge cases where the + extra character would produce more significant digits that we + really want. */ if (format_char == 'Z') - ensure_decimal_point(buffer, buf_size); + buffer = ensure_decimal_point(buffer, buf_size, -1); return buffer; } @@ -600,7 +693,7 @@ /* Possibly make sure we have at least one character after the decimal point (and make sure we have a decimal point). */ if (flags & Py_DTSF_ADD_DOT_0) - ensure_decimal_point(buf, buf_len); + buf = ensure_decimal_point(buf, buf_len, precision); } /* Add the sign if asked and the result isn't negative. */

1 0

r72118 - in python/branches/py3k: Lib/test/test_aifc.py
by r.david.murray 29 Apr '09

29 Apr '09

Author: r.david.murray Date: Wed Apr 29 22:40:42 2009 New Revision: 72118 Log: Merged revisions 72115 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72115 | r.david.murray | 2009-04-29 16:15:18 -0400 (Wed, 29 Apr 2009) | 2 lines More aifc tests. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_aifc.py Modified: python/branches/py3k/Lib/test/test_aifc.py ============================================================================== --- python/branches/py3k/Lib/test/test_aifc.py (original) +++ python/branches/py3k/Lib/test/test_aifc.py Wed Apr 29 22:40:42 2009 @@ -1,5 +1,6 @@ -from test.support import findfile, run_unittest +from test.support import findfile, run_unittest, TESTFN import unittest +import os import aifc @@ -7,16 +8,29 @@ class AIFCTest(unittest.TestCase): def setUp(self): + self.f = self.fout = None self.sndfilepath = findfile('Sine-1000Hz-300ms.aif') + def tearDown(self): + if self.f is not None: + self.f.close() + if self.fout is not None: + try: + self.fout.close() + except (aifc.Error, AttributeError): + pass + try: + os.remove(TESTFN) + except OSError: + pass + def test_skipunknown(self): #Issue 2245 #This file contains chunk types aifc doesn't recognize. f = aifc.open(self.sndfilepath) - f.close() def test_params(self): - f = aifc.open(self.sndfilepath) + f = self.f = aifc.open(self.sndfilepath) self.assertEqual(f.getnchannels(), 2) self.assertEqual(f.getsampwidth(), 2) self.assertEqual(f.getframerate(), 48000) @@ -29,10 +43,9 @@ f.getparams(), (2, 2, 48000, 14400, b'NONE', b'not compressed'), ) - f.close() def test_read(self): - f = aifc.open(self.sndfilepath) + f = self.f = aifc.open(self.sndfilepath) self.assertEqual(f.tell(), 0) self.assertEqual(f.readframes(2), b'\x00\x00\x00\x00\x0b\xd4\x0b\xd4') f.rewind() @@ -46,9 +59,42 @@ self.assertEqual(f.readframes(2), b'\x17t\x17t"\xad"\xad') f.setpos(pos0) self.assertEqual(f.readframes(2), b'\x00\x00\x00\x00\x0b\xd4\x0b\xd4') - f.close() - #XXX Need more tests! + def test_write(self): + f = self.f = aifc.open(self.sndfilepath) + fout = self.fout = aifc.open(TESTFN, 'wb') + fout.aifc() + fout.setparams(f.getparams()) + for frame in range(f.getnframes()): + fout.writeframes(f.readframes(1)) + fout.close() + fout = self.fout = aifc.open(TESTFN, 'rb') + f.rewind() + self.assertEqual(f.getparams(), fout.getparams()) + self.assertEqual(f.readframes(5), fout.readframes(5)) + + def test_compress(self): + f = self.f = aifc.open(self.sndfilepath) + fout = self.fout = aifc.open(TESTFN, 'wb') + fout.aifc() + fout.setnchannels(f.getnchannels()) + fout.setsampwidth(f.getsampwidth()) + fout.setframerate(f.getframerate()) + fout.setcomptype(b'ULAW', b'foo') + for frame in range(f.getnframes()): + fout.writeframes(f.readframes(1)) + fout.close() + self.assertLess( + os.stat(TESTFN).st_size, + os.stat(self.sndfilepath).st_size*0.75, + ) + fout = self.fout = aifc.open(TESTFN, 'rb') + f.rewind() + self.assertEqual(f.getparams()[0:3], fout.getparams()[0:3]) + self.assertEqual(fout.getcomptype(), b'ULAW') + self.assertEqual(fout.getcompname(), b'foo') + # XXX: this test fails, not sure if it should succeed or not + # self.assertEqual(f.readframes(5), fout.readframes(5)) def test_main():

1 0

r72117 - python/trunk/configure
by benjamin.peterson 29 Apr '09

29 Apr '09

Author: benjamin.peterson Date: Wed Apr 29 22:36:25 2009 New Revision: 72117 Log: run autoconf Modified: python/trunk/configure Modified: python/trunk/configure ============================================================================== --- python/trunk/configure (original) +++ python/trunk/configure Wed Apr 29 22:36:25 2009 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 71009 . +# From configure.in Revision: 72114 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 2.7. # @@ -1346,6 +1346,10 @@ --with-pydebug build with Py_DEBUG defined --with-libs='lib1 ...' link against additional libs --with-system-ffi build _ctypes module using an installed ffi library + --with-dbmliborder=db1:db2:... + order to check db backends for dbm. Valid value is a + colon separated string with the backend names + `ndbm', `gdbm' and `bdb'. --with-signal-module disable/enable signal module --with-dec-threads use DEC Alpha/OSF1 thread-safe libraries --with(out)-threads[=DIRECTORY] @@ -14248,6 +14252,33 @@ { echo "$as_me:$LINENO: result: $with_system_ffi" >&5 echo "${ECHO_T}$with_system_ffi" >&6; } +# Check for --with-dbmliborder +{ echo "$as_me:$LINENO: checking for --with-dbmliborder" >&5 +echo $ECHO_N "checking for --with-dbmliborder... $ECHO_C" >&6; } + +# Check whether --with-dbmliborder was given. +if test "${with_dbmliborder+set}" = set; then + withval=$with_dbmliborder; +if test x$with_dbmliborder = xyes +then +{ { echo "$as_me:$LINENO: error: proper usage is --with-dbmliborder=db1:db2:..." >&5 +echo "$as_me: error: proper usage is --with-dbmliborder=db1:db2:..." >&2;} + { (exit 1); exit 1; }; } +else + for db in `echo $with_dbmliborder | sed 's/:/ /g'`; do + if test x$db != xndbm && test x$db != xgdbm && test x$db != xbdb + then + { { echo "$as_me:$LINENO: error: proper usage is --with-dbmliborder=db1:db2:..." >&5 +echo "$as_me: error: proper usage is --with-dbmliborder=db1:db2:..." >&2;} + { (exit 1); exit 1; }; } + fi + done +fi +fi + +{ echo "$as_me:$LINENO: result: $with_dbmliborder" >&5 +echo "${ECHO_T}$with_dbmliborder" >&6; } + # Determine if signalmodule should be used.

1 0

r72116 - python/branches/release26-maint
by r.david.murray 29 Apr '09

29 Apr '09

Author: r.david.murray Date: Wed Apr 29 22:25:16 2009 New Revision: 72116 Log: One of these tests uses a unittest method that wasn't backported. Blocked revisions 72115 via svnmerge ........ r72115 | r.david.murray | 2009-04-29 16:15:18 -0400 (Wed, 29 Apr 2009) | 2 lines More aifc tests. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r72115 - 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 22:15:18 2009 New Revision: 72115 Log: More aifc 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 22:15:18 2009 @@ -1,5 +1,6 @@ -from test.test_support import findfile, run_unittest +from test.test_support import findfile, run_unittest, TESTFN import unittest +import os import aifc @@ -7,16 +8,29 @@ class AIFCTest(unittest.TestCase): def setUp(self): + self.f = self.fout = None self.sndfilepath = findfile('Sine-1000Hz-300ms.aif') + def tearDown(self): + if self.f is not None: + self.f.close() + if self.fout is not None: + try: + self.fout.close() + except (aifc.Error, AttributeError): + pass + try: + os.remove(TESTFN) + except OSError: + pass + def test_skipunknown(self): #Issue 2245 #This file contains chunk types aifc doesn't recognize. f = aifc.open(self.sndfilepath) - f.close() def test_params(self): - f = aifc.open(self.sndfilepath) + f = self.f = aifc.open(self.sndfilepath) self.assertEqual(f.getnchannels(), 2) self.assertEqual(f.getsampwidth(), 2) self.assertEqual(f.getframerate(), 48000) @@ -24,10 +38,9 @@ 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) + f = 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() @@ -41,9 +54,42 @@ 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_write(self): + f = self.f = aifc.open(self.sndfilepath) + fout = self.fout = aifc.open(TESTFN, 'wb') + fout.aifc() + fout.setparams(f.getparams()) + for frame in range(f.getnframes()): + fout.writeframes(f.readframes(1)) + fout.close() + fout = self.fout = aifc.open(TESTFN, 'rb') + f.rewind() + self.assertEqual(f.getparams(), fout.getparams()) + self.assertEqual(f.readframes(5), fout.readframes(5)) + + def test_compress(self): + f = self.f = aifc.open(self.sndfilepath) + fout = self.fout = aifc.open(TESTFN, 'wb') + fout.aifc() + fout.setnchannels(f.getnchannels()) + fout.setsampwidth(f.getsampwidth()) + fout.setframerate(f.getframerate()) + fout.setcomptype('ULAW', 'foo') + for frame in range(f.getnframes()): + fout.writeframes(f.readframes(1)) + fout.close() + self.assertLess( + os.stat(TESTFN).st_size, + os.stat(self.sndfilepath).st_size*0.75, + ) + fout = self.fout = aifc.open(TESTFN, 'rb') + f.rewind() + self.assertEqual(f.getparams()[0:3], fout.getparams()[0:3]) + self.assertEqual(fout.getcomptype(), 'ULAW') + self.assertEqual(fout.getcompname(), 'foo') + # XXX: this test fails, not sure if it should succeed or not + # self.assertEqual(f.readframes(5), fout.readframes(5)) def test_main():

1 0

r72114 - python/trunk/configure.in
by matthias.klose 29 Apr '09

29 Apr '09

Author: matthias.klose Date: Wed Apr 29 22:09:50 2009 New Revision: 72114 Log: - configure.in: Don't error, when no --with-dbmliborder option is present Modified: python/trunk/configure.in Modified: python/trunk/configure.in ============================================================================== --- python/trunk/configure.in (original) +++ python/trunk/configure.in Wed Apr 29 22:09:50 2009 @@ -1933,10 +1933,8 @@ AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:...]) fi done - AC_MSG_RESULT($with_dbmliborder) -fi], -[AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:...]) -]) +fi]) +AC_MSG_RESULT($with_dbmliborder) # Determine if signalmodule should be used. AC_SUBST(USE_SIGNAL_MODULE)

1 0

r72113 - peps/trunk/pep-0383.txt
by martin.v.loewis 29 Apr '09

29 Apr '09

Author: martin.v.loewis Date: Wed Apr 29 22:06:29 2009 New Revision: 72113 Log: Fix code example. Specify that the error handler is used on all relevant APIs. Modified: peps/trunk/pep-0383.txt Modified: peps/trunk/pep-0383.txt ============================================================================== --- peps/trunk/pep-0383.txt (original) +++ peps/trunk/pep-0383.txt Wed Apr 29 22:06:29 2009 @@ -74,7 +74,8 @@ To convert non-decodable bytes, a new error handler "python-escape" is introduced, which produces these half surrogates. On encoding, the error handler converts the half surrogate back to the corresponding -byte. +byte. This error handler used used in any API that receives or produces +file names, command line arguments, or environment variables. The error handler interface is extended to allow the encode error handler to return byte strings immediately, in addition to returning @@ -119,7 +120,7 @@ dirname = dirname.decode(fse, "python-escape") for fn in os.listdir(dirname): # fn is now a str object - yield fn.encode(fse, "python-escape" + yield fn.encode(fse, "python-escape") Copyright =========

1 0