Mailman 3 April 2018 - Python-checkins

bpo-27645, sqlite: Fix integer overflow on sleep (#6594)
by Victor Stinner 30 Apr '18

30 Apr '18

https://github.com/python/cpython/commit/ca405017d5e776a2e3d9291236e62d2e09… commit: ca405017d5e776a2e3d9291236e62d2e09489dd2 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-04-30T12:22:17+02:00 summary: bpo-27645, sqlite: Fix integer overflow on sleep (#6594) Use the _PyTime_t type and round away from zero (ROUND_UP, _PyTime_ROUND_TIMEOUT) the sleep duration, when converting a Python object to seconds and then to milliseconds. Raise an OverflowError in case of overflow. Previously the (int)double conversion rounded towards zero (ROUND_DOWN). files: M Modules/_sqlite/connection.c diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 6e0576151ccb..ef2daeb0c257 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -1461,17 +1461,33 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *args, PyObject * const char *name = "main"; int rc; int callback_error = 0; - double sleep_secs = 0.250; + PyObject *sleep_obj = NULL; + int sleep_ms = 250; sqlite3 *bck_conn; sqlite3_backup *bck_handle; static char *keywords[] = {"target", "pages", "progress", "name", "sleep", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|$iOsd:backup", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|$iOsO:backup", keywords, &pysqlite_ConnectionType, &target, - &pages, &progress, &name, &sleep_secs)) { + &pages, &progress, &name, &sleep_obj)) { return NULL; } + if (sleep_obj != NULL) { + _PyTime_t sleep_secs; + if (_PyTime_FromSecondsObject(&sleep_secs, sleep_obj, + _PyTime_ROUND_TIMEOUT)) { + return NULL; + } + _PyTime_t ms = _PyTime_AsMilliseconds(sleep_secs, + _PyTime_ROUND_TIMEOUT); + if (ms < INT_MIN || ms > INT_MAX) { + PyErr_SetString(PyExc_OverflowError, "sleep is too large"); + return NULL; + } + sleep_ms = (int)ms; + } + if (!pysqlite_check_connection((pysqlite_Connection *)target)) { return NULL; } @@ -1531,7 +1547,7 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *args, PyObject * the engine could not make any progress */ if (rc == SQLITE_BUSY || rc == SQLITE_LOCKED) { Py_BEGIN_ALLOW_THREADS - sqlite3_sleep(sleep_secs * 1000.0); + sqlite3_sleep(sleep_ms); Py_END_ALLOW_THREADS } } while (rc == SQLITE_OK || rc == SQLITE_BUSY || rc == SQLITE_LOCKED);

1 0

Daily reference leaks (4243df51fe43): sum=5
by solipsis＠pitrou.net 30 Apr '18

30 Apr '18

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [7, -7, 1] memory blocks, sum=1 test_functools leaked [0, 3, 1] memory blocks, sum=4 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogyu60Nb', '--timeout', '7200']

1 0

[2.7] bpo-33256: Replace angle brackets around python object repr to display it in html (GH-6442). (GH-6650)
by Serhiy Storchaka 30 Apr '18

30 Apr '18

https://github.com/python/cpython/commit/07ad02f62cc336772e12e3fd837579952b… commit: 07ad02f62cc336772e12e3fd837579952b03ca57 branch: 2.7 author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-30T11:34:47+03:00 summary: [2.7] bpo-33256: Replace angle brackets around python object repr to display it in html (GH-6442). (GH-6650) (cherry picked from commit 7d68bfa82654ba01d860b8a772ff63bf0bd183ee) Co-authored-by: sblondon <sblondon(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2018-04-10-20-57-14.bpo-33256.ndHkqu.rst M Lib/cgitb.py M Misc/ACKS diff --git a/Lib/cgitb.py b/Lib/cgitb.py index 8acc4b75fe3b..3689f8a4ba02 100644 --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -125,7 +125,7 @@ def html(einfo, context=5): args, varargs, varkw, locals = inspect.getargvalues(frame) call = '' if func != '?': - call = 'in ' + strong(func) + \ + call = 'in ' + strong(pydoc.html.escape(func)) + \ inspect.formatargvalues(args, varargs, varkw, locals, formatvalue=lambda value: '=' + pydoc.html.repr(value)) @@ -285,7 +285,7 @@ def handle(self, info=None): if self.display: if plain: - doc = doc.replace('&', '&').replace('<', '<') + doc = pydoc.html.escape(doc) self.file.write('<pre>' + doc + '</pre>\n') else: self.file.write(doc + '\n') diff --git a/Misc/ACKS b/Misc/ACKS index 28255740c7f0..580b0c5bf76d 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -138,6 +138,7 @@ Mike Bland Martin Bless Pablo Bleyer Erik van Blokland +Stéphane Blondon Eric Blossom Sergey Bobrov Finn Bock diff --git a/Misc/NEWS.d/next/Library/2018-04-10-20-57-14.bpo-33256.ndHkqu.rst b/Misc/NEWS.d/next/Library/2018-04-10-20-57-14.bpo-33256.ndHkqu.rst new file mode 100644 index 000000000000..a0605c04b4de --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-10-20-57-14.bpo-33256.ndHkqu.rst @@ -0,0 +1 @@ +Fix display of ``<module>`` call in the html produced by ``cgitb.html()``. Patch by Stéphane Blondon.

1 0

bpo-21474: Update IDLE word/identifier definition from ascii to unicode. (GH-6643)
by Miss Islington (bot) 30 Apr '18

30 Apr '18

https://github.com/python/cpython/commit/3d11630ff401cfcdf094cf039cb575332e… commit: 3d11630ff401cfcdf094cf039cb575332ecaea20 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-30T00:48:16-07:00 summary: bpo-21474: Update IDLE word/identifier definition from ascii to unicode. (GH-6643) In text and entry boxes, this affects selection by double-click, movement left/right by control-left/right, and deletion left/right by control-BACKSPACE/DEL. (cherry picked from commit 5ff3a161c8a6b525c5e5b3e36e9c43f5a95bda60) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst M Lib/idlelib/editor.py diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index ab9c7e615ef0..892b64ba696d 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -1658,12 +1658,12 @@ def get_accelerator(keydefs, eventname): def fixwordbreaks(root): - # Make sure that Tk's double-click and next/previous word - # operations use our definition of a word (i.e. an identifier) + # On Windows, tcl/tk breaks 'words' only on spaces, as in Command Prompt. + # We want Motif style everywhere. See #21474, msg218992 and followup. tk = root.tk tk.call('tcl_wordBreakAfter', 'a b', 0) # make sure word.tcl is loaded - tk.call('set', 'tcl_wordchars', '[a-zA-Z0-9_]') - tk.call('set', 'tcl_nonwordchars', '[^a-zA-Z0-9_]') + tk.call('set', 'tcl_wordchars', r'\w') + tk.call('set', 'tcl_nonwordchars', r'\W') def _editor_window(parent): # htest # diff --git a/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst b/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst new file mode 100644 index 000000000000..caf640b73b29 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst @@ -0,0 +1,3 @@ +Update word/identifier definition from ascii to unicode. In text and entry +boxes, this affects selection by double-click, movement left/right by +control-left/right, and deletion left/right by control-BACKSPACE/DEL.

1 0

bpo-21474: Update IDLE word/identifier definition from ascii to unicode. (GH-6643)
by Miss Islington (bot) 30 Apr '18

30 Apr '18

https://github.com/python/cpython/commit/887b5f8fc622267e1fd48862ea9d0dfd4a… commit: 887b5f8fc622267e1fd48862ea9d0dfd4a0abdc6 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-30T00:27:50-07:00 summary: bpo-21474: Update IDLE word/identifier definition from ascii to unicode. (GH-6643) In text and entry boxes, this affects selection by double-click, movement left/right by control-left/right, and deletion left/right by control-BACKSPACE/DEL. (cherry picked from commit 5ff3a161c8a6b525c5e5b3e36e9c43f5a95bda60) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst M Lib/idlelib/editor.py diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index ab9c7e615ef0..892b64ba696d 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -1658,12 +1658,12 @@ def get_accelerator(keydefs, eventname): def fixwordbreaks(root): - # Make sure that Tk's double-click and next/previous word - # operations use our definition of a word (i.e. an identifier) + # On Windows, tcl/tk breaks 'words' only on spaces, as in Command Prompt. + # We want Motif style everywhere. See #21474, msg218992 and followup. tk = root.tk tk.call('tcl_wordBreakAfter', 'a b', 0) # make sure word.tcl is loaded - tk.call('set', 'tcl_wordchars', '[a-zA-Z0-9_]') - tk.call('set', 'tcl_nonwordchars', '[^a-zA-Z0-9_]') + tk.call('set', 'tcl_wordchars', r'\w') + tk.call('set', 'tcl_nonwordchars', r'\W') def _editor_window(parent): # htest # diff --git a/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst b/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst new file mode 100644 index 000000000000..caf640b73b29 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst @@ -0,0 +1,3 @@ +Update word/identifier definition from ascii to unicode. In text and entry +boxes, this affects selection by double-click, movement left/right by +control-left/right, and deletion left/right by control-BACKSPACE/DEL.

1 0

bpo-21474: Update IDLE word/identifier definition from ascii to unicode. (GH-6643)
by Terry Jan Reedy 30 Apr '18

30 Apr '18

https://github.com/python/cpython/commit/5ff3a161c8a6b525c5e5b3e36e9c43f5a9… commit: 5ff3a161c8a6b525c5e5b3e36e9c43f5a95bda60 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2018-04-30T03:08:01-04:00 summary: bpo-21474: Update IDLE word/identifier definition from ascii to unicode. (GH-6643) In text and entry boxes, this affects selection by double-click, movement left/right by control-left/right, and deletion left/right by control-BACKSPACE/DEL. files: A Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst M Lib/idlelib/editor.py diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index ab9c7e615ef0..892b64ba696d 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -1658,12 +1658,12 @@ def get_accelerator(keydefs, eventname): def fixwordbreaks(root): - # Make sure that Tk's double-click and next/previous word - # operations use our definition of a word (i.e. an identifier) + # On Windows, tcl/tk breaks 'words' only on spaces, as in Command Prompt. + # We want Motif style everywhere. See #21474, msg218992 and followup. tk = root.tk tk.call('tcl_wordBreakAfter', 'a b', 0) # make sure word.tcl is loaded - tk.call('set', 'tcl_wordchars', '[a-zA-Z0-9_]') - tk.call('set', 'tcl_nonwordchars', '[^a-zA-Z0-9_]') + tk.call('set', 'tcl_wordchars', r'\w') + tk.call('set', 'tcl_nonwordchars', r'\W') def _editor_window(parent): # htest # diff --git a/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst b/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst new file mode 100644 index 000000000000..caf640b73b29 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-04-29-16-13-02.bpo-21474.bglg-F.rst @@ -0,0 +1,3 @@ +Update word/identifier definition from ascii to unicode. In text and entry +boxes, this affects selection by double-click, movement left/right by +control-left/right, and deletion left/right by control-BACKSPACE/DEL.

1 0

Fix reference to exceptions in multprocessing docs. (GH-6647)
by Serhiy Storchaka 30 Apr '18

30 Apr '18

https://github.com/python/cpython/commit/07c3a612c7c17f96bad56f450c0168a5b7… commit: 07c3a612c7c17f96bad56f450c0168a5b7dde61c branch: 2.7 author: Bo Bayles <bbayles(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-04-30T08:29:24+03:00 summary: Fix reference to exceptions in multprocessing docs. (GH-6647) files: M Doc/library/multiprocessing.rst diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 97a7b536670e..81c46c0b637b 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -2050,11 +2050,24 @@ authentication* using the :mod:`hmac` module. unavailable then it is ``None``. -The module defines two exceptions: +The module defines the following exceptions: + +.. exception:: ProcessError + + The base class of all :mod:`multiprocessing` exceptions. + +.. exception:: BufferTooShort + + Exception raised by :meth:`Connection.recv_bytes_into()` when the supplied + buffer object is too small for the message read. .. exception:: AuthenticationError - Exception raised when there is an authentication error. + Raised when there is an authentication error. + +.. exception:: TimeoutError + + Raised by methods with a timeout when the timeout expires. **Examples**

1 0

2.7.15+
by Benjamin Peterson 29 Apr '18

29 Apr '18

https://github.com/python/cpython/commit/0d7d26bce4d25b2083163268c60c5dce21… commit: 0d7d26bce4d25b2083163268c60c5dce21e08d6c branch: 2.7 author: Benjamin Peterson <benjamin(a)python.org> committer: Benjamin Peterson <benjamin(a)python.org> date: 2018-04-29T16:22:11-07:00 summary: 2.7.15+ files: M Include/patchlevel.h diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 99e837024ab4..8a04a90f9acf 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -27,7 +27,7 @@ #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.7.15" +#define PY_VERSION "2.7.15+" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository). Empty

1 0

generate 2.7.15 NEWS
by Benjamin Peterson 29 Apr '18

29 Apr '18

https://github.com/python/cpython/commit/4c86fc01f63b94408626a2f0e67d991643… commit: 4c86fc01f63b94408626a2f0e67d991643980ccc branch: 2.7 author: Benjamin Peterson <benjamin(a)python.org> committer: Benjamin Peterson <benjamin(a)python.org> date: 2018-04-29T15:47:18-07:00 summary: generate 2.7.15 NEWS files: A Misc/NEWS.d/2.7.15.rst D Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/2.7.15.rst similarity index 59% rename from Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst rename to Misc/NEWS.d/2.7.15.rst index 9ec1a605c8f2..52b99da4a6fd 100644 --- a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst +++ b/Misc/NEWS.d/2.7.15.rst @@ -1,3 +1,9 @@ +.. bpo: 33374 +.. date: 2018-04-29-12-07-00 +.. nonce: -xegL6 +.. release date: 2018-04-29 +.. section: Core and Builtins + Tweak the definition of PyGC_Head, so compilers do not believe it is always 16-byte aligned on x86. This prevents crashes with more aggressive optimizations present in GCC 8.

1 0

Indicate that _PyGC_Head is only 8-byte aligned. (closes bpo-33374)
by Benjamin Peterson 29 Apr '18

29 Apr '18

https://github.com/python/cpython/commit/0b91f8a668201fc58fa732b8acc496caed… commit: 0b91f8a668201fc58fa732b8acc496caedfdbae0 branch: 2.7 author: Florian Weimer <fw(a)deneb.enyo.de> committer: Benjamin Peterson <benjamin(a)python.org> date: 2018-04-29T12:18:33-07:00 summary: Indicate that _PyGC_Head is only 8-byte aligned. (closes bpo-33374) By spec, the "long double" in _PyGC_Head requires the union to always be 16-byte aligned. However, obmalloc only yields 8-byte alignment. Compilers including GCC 8 are starting to use alignment information to do store-merging. So, the "long double" needs to be changed to a simple "double" as was long ago done in Python 3 by e348c8d154cf6342c79d627ebfe89dfe9de23817. For 2.7, we need to add some dummy padding to make sure _PyGC_Head stays the same size. files: A Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst M Include/objimpl.h diff --git a/Include/objimpl.h b/Include/objimpl.h index 5f2868332955..cbf6bc3f8763 100644 --- a/Include/objimpl.h +++ b/Include/objimpl.h @@ -248,6 +248,20 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); /* for source compatibility with 2.2 */ #define _PyObject_GC_Del PyObject_GC_Del +/* + * Former over-aligned definition of PyGC_Head, used to compute the size of the + * padding for the new version below. + */ +union _gc_head; +union _gc_head_old { + struct { + union _gc_head_old *gc_next; + union _gc_head_old *gc_prev; + Py_ssize_t gc_refs; + } gc; + long double dummy; +}; + /* GC information is stored BEFORE the object structure. */ typedef union _gc_head { struct { @@ -255,7 +269,8 @@ typedef union _gc_head { union _gc_head *gc_prev; Py_ssize_t gc_refs; } gc; - long double dummy; /* force worst-case alignment */ + double dummy; /* Force at least 8-byte alignment. */ + char dummy_padding[sizeof(union _gc_head_old)]; } PyGC_Head; extern PyGC_Head *_PyGC_generation0; diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst new file mode 100644 index 000000000000..9ec1a605c8f2 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst @@ -0,0 +1,3 @@ +Tweak the definition of PyGC_Head, so compilers do not believe it is always +16-byte aligned on x86. This prevents crashes with more aggressive +optimizations present in GCC 8.

1 0