Mailman 3 January 2011 - Python-checkins

r88286 - in python/branches/release27-maint: Lib/ctypes/test/test_callbacks.py Misc/ACKS Misc/NEWS Modules/_ctypes/_ctypes_test.c Modules/_ctypes/libffi_msvc/ffi.c
by antoine.pitrou Jan. 31, 2011

Jan. 31, 2011

Author: antoine.pitrou Date: Mon Jan 31 22:47:45 2011 New Revision: 88286 Log: Merged revisions 88284 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88284 | antoine.pitrou | 2011-01-31 22:08:57 +0100 (lun., 31 janv. 2011) | 4 lines Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch by Stan Mihai. Ok'ed by Georg. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Lib/ctypes/test/test_callbacks.py python/branches/release27-maint/Misc/ACKS python/branches/release27-maint/Misc/NEWS python/branches/release27-maint/Modules/_ctypes/_ctypes_test.c python/branches/release27-maint/Modules/_ctypes/libffi_msvc/ffi.c Modified: python/branches/release27-maint/Lib/ctypes/test/test_callbacks.py ============================================================================== --- python/branches/release27-maint/Lib/ctypes/test/test_callbacks.py (original) +++ python/branches/release27-maint/Lib/ctypes/test/test_callbacks.py Mon Jan 31 22:47:45 2011 @@ -206,6 +206,42 @@ windll.user32.EnumWindows(EnumWindowsCallbackFunc, 0) + def test_callback_register_int(self): + # Issue #8275: buggy handling of callback args under Win64 + # NOTE: should be run on release builds as well + dll = CDLL(_ctypes_test.__file__) + CALLBACK = CFUNCTYPE(c_int, c_int, c_int, c_int, c_int, c_int) + # All this function does is call the callback with its args squared + func = dll._testfunc_cbk_reg_int + func.argtypes = (c_int, c_int, c_int, c_int, c_int, CALLBACK) + func.restype = c_int + + def callback(a, b, c, d, e): + return a + b + c + d + e + + result = func(2, 3, 4, 5, 6, CALLBACK(callback)) + self.assertEqual(result, callback(2*2, 3*3, 4*4, 5*5, 6*6)) + + def test_callback_register_double(self): + # Issue #8275: buggy handling of callback args under Win64 + # NOTE: should be run on release builds as well + dll = CDLL(_ctypes_test.__file__) + CALLBACK = CFUNCTYPE(c_double, c_double, c_double, c_double, + c_double, c_double) + # All this function does is call the callback with its args squared + func = dll._testfunc_cbk_reg_double + func.argtypes = (c_double, c_double, c_double, + c_double, c_double, CALLBACK) + func.restype = c_double + + def callback(a, b, c, d, e): + return a + b + c + d + e + + result = func(1.1, 2.2, 3.3, 4.4, 5.5, CALLBACK(callback)) + self.assertEqual(result, + callback(1.1*1.1, 2.2*2.2, 3.3*3.3, 4.4*4.4, 5.5*5.5)) + + ################################################################ if __name__ == '__main__': Modified: python/branches/release27-maint/Misc/ACKS ============================================================================== --- python/branches/release27-maint/Misc/ACKS (original) +++ python/branches/release27-maint/Misc/ACKS Mon Jan 31 22:47:45 2011 @@ -539,6 +539,7 @@ Mike Meyer Steven Miale Trent Mick +Stan Mihai Aristotelis Mikropoulos Damien Miller Chad Miller Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Mon Jan 31 22:47:45 2011 @@ -37,6 +37,9 @@ Library ------- +- Issue #8275: Fix passing of callback arguments with ctypes under Win64. + Patch by Stan Mihai. + - Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the menu accelerators for Open Module, Go to Line, and New Indent Width. The accelerators still work but no longer appear in the menu items. Modified: python/branches/release27-maint/Modules/_ctypes/_ctypes_test.c ============================================================================== --- python/branches/release27-maint/Modules/_ctypes/_ctypes_test.c (original) +++ python/branches/release27-maint/Modules/_ctypes/_ctypes_test.c Mon Jan 31 22:47:45 2011 @@ -25,6 +25,20 @@ /* some functions handy for testing */ +EXPORT(int) +_testfunc_cbk_reg_int(int a, int b, int c, int d, int e, + int (*func)(int, int, int, int, int)) +{ + return func(a*a, b*b, c*c, d*d, e*e); +} + +EXPORT(double) +_testfunc_cbk_reg_double(double a, double b, double c, double d, double e, + double (*func)(double, double, double, double, double)) +{ + return func(a*a, b*b, c*c, d*d, e*e); +} + EXPORT(void)testfunc_array(int values[4]) { printf("testfunc_array %d %d %d %d\n", Modified: python/branches/release27-maint/Modules/_ctypes/libffi_msvc/ffi.c ============================================================================== --- python/branches/release27-maint/Modules/_ctypes/libffi_msvc/ffi.c (original) +++ python/branches/release27-maint/Modules/_ctypes/libffi_msvc/ffi.c Mon Jan 31 22:47:45 2011 @@ -380,7 +380,7 @@ short bytes; char *tramp; #ifdef _WIN64 - int mask; + int mask = 0; #endif FFI_ASSERT (cif->abi == FFI_SYSV);

1 0

r88285 - in python/branches/release31-maint: Lib/ctypes/test/test_callbacks.py Misc/ACKS Misc/NEWS Modules/_ctypes/_ctypes_test.c Modules/_ctypes/libffi_msvc/ffi.c
by antoine.pitrou Jan. 31, 2011

Jan. 31, 2011

Author: antoine.pitrou Date: Mon Jan 31 22:36:33 2011 New Revision: 88285 Log: Merged revisions 88284 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88284 | antoine.pitrou | 2011-01-31 22:08:57 +0100 (lun., 31 janv. 2011) | 4 lines Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch by Stan Mihai. Ok'ed by Georg. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/ctypes/test/test_callbacks.py python/branches/release31-maint/Misc/ACKS python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/Modules/_ctypes/_ctypes_test.c python/branches/release31-maint/Modules/_ctypes/libffi_msvc/ffi.c Modified: python/branches/release31-maint/Lib/ctypes/test/test_callbacks.py ============================================================================== --- python/branches/release31-maint/Lib/ctypes/test/test_callbacks.py (original) +++ python/branches/release31-maint/Lib/ctypes/test/test_callbacks.py Mon Jan 31 22:36:33 2011 @@ -166,6 +166,42 @@ self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) + def test_callback_register_int(self): + # Issue #8275: buggy handling of callback args under Win64 + # NOTE: should be run on release builds as well + dll = CDLL(_ctypes_test.__file__) + CALLBACK = CFUNCTYPE(c_int, c_int, c_int, c_int, c_int, c_int) + # All this function does is call the callback with its args squared + func = dll._testfunc_cbk_reg_int + func.argtypes = (c_int, c_int, c_int, c_int, c_int, CALLBACK) + func.restype = c_int + + def callback(a, b, c, d, e): + return a + b + c + d + e + + result = func(2, 3, 4, 5, 6, CALLBACK(callback)) + self.assertEqual(result, callback(2*2, 3*3, 4*4, 5*5, 6*6)) + + def test_callback_register_double(self): + # Issue #8275: buggy handling of callback args under Win64 + # NOTE: should be run on release builds as well + dll = CDLL(_ctypes_test.__file__) + CALLBACK = CFUNCTYPE(c_double, c_double, c_double, c_double, + c_double, c_double) + # All this function does is call the callback with its args squared + func = dll._testfunc_cbk_reg_double + func.argtypes = (c_double, c_double, c_double, + c_double, c_double, CALLBACK) + func.restype = c_double + + def callback(a, b, c, d, e): + return a + b + c + d + e + + result = func(1.1, 2.2, 3.3, 4.4, 5.5, CALLBACK(callback)) + self.assertEqual(result, + callback(1.1*1.1, 2.2*2.2, 3.3*3.3, 4.4*4.4, 5.5*5.5)) + + ################################################################ if __name__ == '__main__': Modified: python/branches/release31-maint/Misc/ACKS ============================================================================== --- python/branches/release31-maint/Misc/ACKS (original) +++ python/branches/release31-maint/Misc/ACKS Mon Jan 31 22:36:33 2011 @@ -536,6 +536,7 @@ Mike Meyer Steven Miale Trent Mick +Stan Mihai Aristotelis Mikropoulos Damien Miller Chad Miller Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Mon Jan 31 22:36:33 2011 @@ -37,6 +37,9 @@ Library ------- +- Issue #8275: Fix passing of callback arguments with ctypes under Win64. + Patch by Stan Mihai. + - Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x, preventing a confusing hung appearance on OS X with the windows obscured. Modified: python/branches/release31-maint/Modules/_ctypes/_ctypes_test.c ============================================================================== --- python/branches/release31-maint/Modules/_ctypes/_ctypes_test.c (original) +++ python/branches/release31-maint/Modules/_ctypes/_ctypes_test.c Mon Jan 31 22:36:33 2011 @@ -12,6 +12,20 @@ /* some functions handy for testing */ +EXPORT(int) +_testfunc_cbk_reg_int(int a, int b, int c, int d, int e, + int (*func)(int, int, int, int, int)) +{ + return func(a*a, b*b, c*c, d*d, e*e); +} + +EXPORT(double) +_testfunc_cbk_reg_double(double a, double b, double c, double d, double e, + double (*func)(double, double, double, double, double)) +{ + return func(a*a, b*b, c*c, d*d, e*e); +} + EXPORT(void)testfunc_array(int values[4]) { printf("testfunc_array %d %d %d %d\n", Modified: python/branches/release31-maint/Modules/_ctypes/libffi_msvc/ffi.c ============================================================================== --- python/branches/release31-maint/Modules/_ctypes/libffi_msvc/ffi.c (original) +++ python/branches/release31-maint/Modules/_ctypes/libffi_msvc/ffi.c Mon Jan 31 22:36:33 2011 @@ -379,7 +379,7 @@ short bytes; char *tramp; #ifdef _WIN64 - int mask; + int mask = 0; #endif FFI_ASSERT (cif->abi == FFI_SYSV);

1 0

r88284 - in python/branches/py3k: Lib/ctypes/test/test_callbacks.py Misc/ACKS Misc/NEWS Modules/_ctypes/_ctypes_test.c Modules/_ctypes/libffi_msvc/ffi.c
by antoine.pitrou Jan. 31, 2011

Jan. 31, 2011

Author: antoine.pitrou Date: Mon Jan 31 22:08:57 2011 New Revision: 88284 Log: Issue #8275: Fix passing of callback arguments with ctypes under Win64. Patch by Stan Mihai. Ok'ed by Georg. Modified: python/branches/py3k/Lib/ctypes/test/test_callbacks.py python/branches/py3k/Misc/ACKS python/branches/py3k/Misc/NEWS python/branches/py3k/Modules/_ctypes/_ctypes_test.c python/branches/py3k/Modules/_ctypes/libffi_msvc/ffi.c Modified: python/branches/py3k/Lib/ctypes/test/test_callbacks.py ============================================================================== --- python/branches/py3k/Lib/ctypes/test/test_callbacks.py (original) +++ python/branches/py3k/Lib/ctypes/test/test_callbacks.py Mon Jan 31 22:08:57 2011 @@ -200,6 +200,42 @@ windll.user32.EnumWindows(EnumWindowsCallbackFunc, 0) + def test_callback_register_int(self): + # Issue #8275: buggy handling of callback args under Win64 + # NOTE: should be run on release builds as well + dll = CDLL(_ctypes_test.__file__) + CALLBACK = CFUNCTYPE(c_int, c_int, c_int, c_int, c_int, c_int) + # All this function does is call the callback with its args squared + func = dll._testfunc_cbk_reg_int + func.argtypes = (c_int, c_int, c_int, c_int, c_int, CALLBACK) + func.restype = c_int + + def callback(a, b, c, d, e): + return a + b + c + d + e + + result = func(2, 3, 4, 5, 6, CALLBACK(callback)) + self.assertEqual(result, callback(2*2, 3*3, 4*4, 5*5, 6*6)) + + def test_callback_register_double(self): + # Issue #8275: buggy handling of callback args under Win64 + # NOTE: should be run on release builds as well + dll = CDLL(_ctypes_test.__file__) + CALLBACK = CFUNCTYPE(c_double, c_double, c_double, c_double, + c_double, c_double) + # All this function does is call the callback with its args squared + func = dll._testfunc_cbk_reg_double + func.argtypes = (c_double, c_double, c_double, + c_double, c_double, CALLBACK) + func.restype = c_double + + def callback(a, b, c, d, e): + return a + b + c + d + e + + result = func(1.1, 2.2, 3.3, 4.4, 5.5, CALLBACK(callback)) + self.assertEqual(result, + callback(1.1*1.1, 2.2*2.2, 3.3*3.3, 4.4*4.4, 5.5*5.5)) + + ################################################################ if __name__ == '__main__': Modified: python/branches/py3k/Misc/ACKS ============================================================================== --- python/branches/py3k/Misc/ACKS (original) +++ python/branches/py3k/Misc/ACKS Mon Jan 31 22:08:57 2011 @@ -574,6 +574,7 @@ Mike Meyer Steven Miale Trent Mick +Stan Mihai Aristotelis Mikropoulos Damien Miller Chad Miller Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Jan 31 22:08:57 2011 @@ -13,6 +13,9 @@ Library ------- +- Issue #8275: Fix passing of callback arguments with ctypes under Win64. + Patch by Stan Mihai. + What's New in Python 3.2 Release Candidate 2? ============================================= Modified: python/branches/py3k/Modules/_ctypes/_ctypes_test.c ============================================================================== --- python/branches/py3k/Modules/_ctypes/_ctypes_test.c (original) +++ python/branches/py3k/Modules/_ctypes/_ctypes_test.c Mon Jan 31 22:08:57 2011 @@ -12,6 +12,20 @@ /* some functions handy for testing */ +EXPORT(int) +_testfunc_cbk_reg_int(int a, int b, int c, int d, int e, + int (*func)(int, int, int, int, int)) +{ + return func(a*a, b*b, c*c, d*d, e*e); +} + +EXPORT(double) +_testfunc_cbk_reg_double(double a, double b, double c, double d, double e, + double (*func)(double, double, double, double, double)) +{ + return func(a*a, b*b, c*c, d*d, e*e); +} + EXPORT(void)testfunc_array(int values[4]) { printf("testfunc_array %d %d %d %d\n", Modified: python/branches/py3k/Modules/_ctypes/libffi_msvc/ffi.c ============================================================================== --- python/branches/py3k/Modules/_ctypes/libffi_msvc/ffi.c (original) +++ python/branches/py3k/Modules/_ctypes/libffi_msvc/ffi.c Mon Jan 31 22:08:57 2011 @@ -380,7 +380,7 @@ short bytes; char *tramp; #ifdef _WIN64 - int mask; + int mask = 0; #endif FFI_ASSERT (cif->abi == FFI_SYSV);

1 0

r88283 - in python/branches/release27-maint: Doc/library/threading.rst
by brian.curtin Jan. 31, 2011

Jan. 31, 2011

Author: brian.curtin Date: Mon Jan 31 20:55:14 2011 New Revision: 88283 Log: Merged revisions 88281 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88281 | brian.curtin | 2011-01-31 13:35:02 -0600 (Mon, 31 Jan 2011) | 2 lines #11083 typo: RuntimeException -> RuntimeError ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Doc/library/threading.rst Modified: python/branches/release27-maint/Doc/library/threading.rst ============================================================================== --- python/branches/release27-maint/Doc/library/threading.rst (original) +++ python/branches/release27-maint/Doc/library/threading.rst Mon Jan 31 20:55:14 2011 @@ -290,7 +290,7 @@ It must be called at most once per thread object. It arranges for the object's :meth:`run` method to be invoked in a separate thread of control. - This method will raise a :exc:`RuntimeException` if called more than once + This method will raise a :exc:`RuntimeError` if called more than once on the same thread object. .. method:: run()

1 0

r88282 - in python/branches/release31-maint: Doc/library/threading.rst
by brian.curtin Jan. 31, 2011

Jan. 31, 2011

Author: brian.curtin Date: Mon Jan 31 20:41:53 2011 New Revision: 88282 Log: Merged revisions 88281 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88281 | brian.curtin | 2011-01-31 13:35:02 -0600 (Mon, 31 Jan 2011) | 2 lines #11083 typo: RuntimeException -> RuntimeError ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/library/threading.rst Modified: python/branches/release31-maint/Doc/library/threading.rst ============================================================================== --- python/branches/release31-maint/Doc/library/threading.rst (original) +++ python/branches/release31-maint/Doc/library/threading.rst Mon Jan 31 20:41:53 2011 @@ -268,7 +268,7 @@ It must be called at most once per thread object. It arranges for the object's :meth:`run` method to be invoked in a separate thread of control. - This method will raise a :exc:`RuntimeException` if called more than once + This method will raise a :exc:`RuntimeError` if called more than once on the same thread object. .. method:: run()

1 0

r88281 - python/branches/py3k/Doc/library/threading.rst
by brian.curtin Jan. 31, 2011

Jan. 31, 2011

Author: brian.curtin Date: Mon Jan 31 20:35:02 2011 New Revision: 88281 Log: #11083 typo: RuntimeException -> RuntimeError Modified: python/branches/py3k/Doc/library/threading.rst Modified: python/branches/py3k/Doc/library/threading.rst ============================================================================== --- python/branches/py3k/Doc/library/threading.rst (original) +++ python/branches/py3k/Doc/library/threading.rst Mon Jan 31 20:35:02 2011 @@ -284,7 +284,7 @@ It must be called at most once per thread object. It arranges for the object's :meth:`run` method to be invoked in a separate thread of control. - This method will raise a :exc:`RuntimeException` if called more than once + This method will raise a :exc:`RuntimeError` if called more than once on the same thread object. .. method:: run()

1 0

r88280 - python/branches/py3k/Lib/struct.py
by alexander.belopolsky Jan. 31, 2011

Jan. 31, 2011

Author: alexander.belopolsky Date: Mon Jan 31 20:27:55 2011 New Revision: 88280 Log: Issue #11081: Fixed struct.__all__. Reviewed by Georg Brandl. Modified: python/branches/py3k/Lib/struct.py Modified: python/branches/py3k/Lib/struct.py ============================================================================== --- python/branches/py3k/Lib/struct.py (original) +++ python/branches/py3k/Lib/struct.py Mon Jan 31 20:27:55 2011 @@ -1,6 +1,6 @@ __all__ = [ # Functions - 'calcsize', 'pack', 'unpack', 'unpack', 'unpack_from', + 'calcsize', 'pack', 'pack_into', 'unpack', 'unpack_from', # Classes 'Struct',

1 0

r88276 - in python/branches/py3k: Include/patchlevel.h Misc/NEWS
by georg.brandl Jan. 31, 2011

Jan. 31, 2011

Author: georg.brandl Date: Mon Jan 31 11:39:57 2011 New Revision: 88276 Log: Post-release updates. Modified: python/branches/py3k/Include/patchlevel.h python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Include/patchlevel.h ============================================================================== --- python/branches/py3k/Include/patchlevel.h (original) +++ python/branches/py3k/Include/patchlevel.h Mon Jan 31 11:39:57 2011 @@ -23,7 +23,7 @@ #define PY_RELEASE_SERIAL 2 /* Version as a string */ -#define PY_VERSION "3.2rc2" +#define PY_VERSION "3.2rc2+" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository) */ Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Jan 31 11:39:57 2011 @@ -2,6 +2,18 @@ Python News +++++++++++ +What's New in Python 3.2? +========================= + +*Release date: XX-Feb-2011* + +Core and Builtins +----------------- + +Library +------- + + What's New in Python 3.2 Release Candidate 2? =============================================

1 0

r88275 - python/branches/py3k/Doc/whatsnew/3.2.rst
by raymond.hettinger Jan. 31, 2011

Jan. 31, 2011

Author: raymond.hettinger Date: Mon Jan 31 07:34:47 2011 New Revision: 88275 Log: Recommend use of the tracker during the RC phase or just before a beta. Modified: python/branches/py3k/Doc/whatsnew/3.2.rst Modified: python/branches/py3k/Doc/whatsnew/3.2.rst ============================================================================== --- python/branches/py3k/Doc/whatsnew/3.2.rst (original) +++ python/branches/py3k/Doc/whatsnew/3.2.rst Mon Jan 31 07:34:47 2011 @@ -11,7 +11,10 @@ * Anyone can add text to this document. Do not spend very much time on the wording of your changes, because your text will probably - get rewritten. + get rewritten. (Note, during release candidate phase or just before + a beta release, please use the tracker instead -- this helps avoid + merge conflicts. If you must add a suggested entry directly, + please put it in an XXX comment and the maintainer will take notice). * The maintainer will go through Misc/NEWS periodically and add changes; it's therefore more important to add your changes to

1 0

r88274 - python/branches/py3k/Doc/whatsnew/3.2.rst
by raymond.hettinger Jan. 31, 2011

Jan. 31, 2011

Author: raymond.hettinger Date: Mon Jan 31 07:14:48 2011 New Revision: 88274 Log: Fix minor grammar nits. Revert r88272 -- the examples are more readable with spacing. Add todos for difflib and logging. Modified: python/branches/py3k/Doc/whatsnew/3.2.rst Modified: python/branches/py3k/Doc/whatsnew/3.2.rst ============================================================================== --- python/branches/py3k/Doc/whatsnew/3.2.rst (original) +++ python/branches/py3k/Doc/whatsnew/3.2.rst Mon Jan 31 07:14:48 2011 @@ -88,7 +88,7 @@ positional arguments (not just options), subcommands, required options and other common patterns of specifying and validating options. -This module already has widespread success in the community as a +This module has already had widespread success in the community as a third-party module. Being more fully featured than its predecessor, the :mod:`argparse` module is now the preferred module for command-line processing. The older module is still being kept available because of the substantial amount @@ -100,18 +100,18 @@ import argparse parser = argparse.ArgumentParser( - description='Manage servers', # main description for help - epilog='Tested on Solaris and Linux') # displayed after help + description = 'Manage servers', # main description for help + epilog = 'Tested on Solaris and Linux') # displayed after help parser.add_argument('action', # argument name - choices=['deploy', 'start', 'stop'], # three allowed values - help='action on each target') # help msg + choices = ['deploy', 'start', 'stop'], # three allowed values + help = 'action on each target') # help msg parser.add_argument('targets', - metavar='HOSTNAME', # var name used in help msg - nargs='+', # require one or more targets - help='url for target machines') # help msg explanation + metavar = 'HOSTNAME', # var name used in help msg + nargs = '+', # require one or more targets + help = 'url for target machines') # help msg explanation parser.add_argument('-u', '--user', # -u or --user option - required=True, # make it a required argument - help='login as user') + required = True, # make it a required argument + help = 'login as user') Example of calling the parser on a command string:: @@ -329,7 +329,7 @@ * The :mod:`py_compile` and :mod:`compileall` modules have been updated to reflect the new naming convention and target directory. The command-line invocation of *compileall* has new command-line options: ``-i`` for - specifying a list of files and directories to compile, and ``-b`` which causes + specifying a list of files and directories to compile and ``-b`` which causes bytecode files to be written to their legacy location rather than *__pycache__*. @@ -391,7 +391,7 @@ The *native strings* are always of type :class:`str` but are restricted to code points between *U+0000* through *U+00FF* which are translatable to bytes using *Latin-1* encoding. These strings are used for the keys and values in the -``environ`` dictionary and for response headers and statuses in the +environment dictionary and for response headers and statuses in the :func:`start_response` function. They must follow :rfc:`2616` with respect to encoding. That is, they must either be *ISO-8859-1* characters or use :rfc:`2047` MIME encoding. @@ -1414,7 +1414,7 @@ --- The :mod:`ast` module has a wonderful a general-purpose tool for safely -evaluating strings containing Python expressions using the Python literal +evaluating expression strings using the Python literal syntax. The :func:`ast.literal_eval` function serves as a secure alternative to the builtin :func:`eval` function which is easily abused. Python 3.2 adds :class:`bytes` and :class:`set` literals to the list of supported types: @@ -1881,8 +1881,7 @@ dbm --- -All database modules now support :meth:`get` and :meth:`setdefault` are now -available in all database modules +All database modules now support the :meth:`get` and :meth:`setdefault` methods. (Suggested by Ray Allen in :issue:`9523`.) @@ -2094,14 +2093,8 @@ (All changes contributed by Łukasz Langa.) -difflib -------- - -:class:`difflib.SequenceMatcher` has a new parameter in its constructor, -*autojunk*, that allows the user to turn off the automatic junk heuristic the -class uses in its algorithm. Additionally, two new attributes were exposed -to users - *bjunk* and *bpopular*, allowing better understanding of the -heuristics used by the class. +.. XXX show a difflib example +.. XXX add entry for logging changes other than the dict config pep urllib.parse ------------ @@ -2460,13 +2453,13 @@ function declaration, which was kept for backwards compatibility reasons, is now removed -- the macro was introduced in 1997 (:issue:`8276`). -* The is a new function :c:func:`PyLong_AsLongLongAndOverflow` which +* There is a new function :c:func:`PyLong_AsLongLongAndOverflow` which is analogous to :c:func:`PyLong_AsLongAndOverflow`. They both serve to convert Python :class:`int` into a native fixed-width type while providing detection of cases where the conversion won't fit (:issue:`7767`). -* The :c:func:`PyUnicode_CompareWithASCIIString` now returns *not equal* - if the Python string is *NUL* terminated. +* The :c:func:`PyUnicode_CompareWithASCIIString` function now returns *not + equal* if the Python string is *NUL* terminated. * There is a new function :c:func:`PyErr_NewExceptionWithDoc` that is like :c:func:`PyErr_NewException` but allows a docstring to be specified. @@ -2621,6 +2614,6 @@ and :c:func:`PyEval_RestoreThread()`) should be used instead. * Due to security risks, :func:`asyncore.handle_accept` has been deprecated, and - a new function, :func:`asyncore.handle_accepted` was added to replace it. + a new function, :func:`asyncore.handle_accepted`, was added to replace it. (Contributed by Giampaolo Rodola in :issue:`6706`.)

1 0