Mailman 3 August 2018 - Python-checkins

bpo-29565: Fix compilation for C89 (GH-8626)
by Victor Stinner 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/6a6b2483479a1ad0ab82300452f0ce71fa… commit: 6a6b2483479a1ad0ab82300452f0ce71fa90b2d7 branch: 2.7 author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-08-02T17:40:11+02:00 summary: bpo-29565: Fix compilation for C89 (GH-8626) Use a local scope for the 'i' variable. files: M Modules/_ctypes/libffi_msvc/ffi.c diff --git a/Modules/_ctypes/libffi_msvc/ffi.c b/Modules/_ctypes/libffi_msvc/ffi.c index 75dada56133d..f28c3e0a3859 100644 --- a/Modules/_ctypes/libffi_msvc/ffi.c +++ b/Modules/_ctypes/libffi_msvc/ffi.c @@ -220,14 +220,18 @@ ffi_call(/*@dependent@*/ ffi_cif *cif, break; #else case FFI_SYSV: - /* If a single argument takes more than 8 bytes, - then a copy is passed by reference. */ - for (unsigned i = 0; i < cif->nargs; i++) { - size_t z = cif->arg_types[i]->size; - if (z > 8) { - void *temp = alloca(z); - memcpy(temp, avalue[i], z); - avalue[i] = temp; + /* use a local scope for the 'i' variable */ + { + unsigned i; + /* If a single argument takes more than 8 bytes, + then a copy is passed by reference. */ + for (i = 0; i < cif->nargs; i++) { + size_t z = cif->arg_types[i]->size; + if (z > 8) { + void *temp = alloca(z); + memcpy(temp, avalue[i], z); + avalue[i] = temp; + } } } /*@-usedef@*/

1 0

bpo-29565: Corrected ctypes passing of large structs by value on Windows AMD64 (GH-168) (GH-8625)
by Victor Stinner 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/3243f8c1fb16b6de73f1d7a30f5d090475… commit: 3243f8c1fb16b6de73f1d7a30f5d09047553bce3 branch: 2.7 author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-08-02T16:47:26+02:00 summary: bpo-29565: Corrected ctypes passing of large structs by value on Windows AMD64 (GH-168) (GH-8625) Fixed bpo-29565: Corrected ctypes passing of large structs by value. Added code and test to check that when a structure passed by value is large enough to need to be passed by reference, a copy of the original structure is passed. The callee updates the passed-in value, and the test verifies that the caller's copy is unchanged. A similar change was also added to the test added for bpo-20160 (that test was passing, but the changes should guard against regressions). (cherry picked from commit a86339b83fbd0932e0529a3c91935e997a234582) files: M Lib/ctypes/test/test_callbacks.py M Lib/ctypes/test/test_structures.py M Modules/_ctypes/_ctypes_test.c M Modules/_ctypes/libffi_msvc/ffi.c diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py index bf894d481c3e..db3d9e7b198b 100644 --- a/Lib/ctypes/test/test_callbacks.py +++ b/Lib/ctypes/test/test_callbacks.py @@ -250,6 +250,7 @@ def callback(a, b, c, d, e): def test_callback_large_struct(self): class Check: pass + # This should mirror the structure in Modules/_ctypes/_ctypes_test.c class X(Structure): _fields_ = [ ('first', c_ulong), @@ -261,6 +262,11 @@ def callback(check, s): check.first = s.first check.second = s.second check.third = s.third + # See issue #29565. + # The structure should be passed by value, so + # any changes to it should not be reflected in + # the value passed + s.first = s.second = s.third = 0x0badf00d check = Check() s = X() @@ -281,6 +287,11 @@ def callback(check, s): self.assertEqual(check.first, 0xdeadbeef) self.assertEqual(check.second, 0xcafebabe) self.assertEqual(check.third, 0x0bad1dea) + # See issue #29565. + # Ensure that the original struct is unchanged. + self.assertEqual(s.first, check.first) + self.assertEqual(s.second, check.second) + self.assertEqual(s.third, check.third) ################################################################ diff --git a/Lib/ctypes/test/test_structures.py b/Lib/ctypes/test/test_structures.py index 5650189f8a89..9a863c94dafc 100644 --- a/Lib/ctypes/test/test_structures.py +++ b/Lib/ctypes/test/test_structures.py @@ -3,6 +3,7 @@ from ctypes.test import need_symbol from struct import calcsize import _testcapi +import _ctypes_test class SubclassesTest(unittest.TestCase): def test_subclass(self): @@ -401,6 +402,28 @@ class Z(Y): (1, 0, 0, 0, 0, 0)) self.assertRaises(TypeError, lambda: Z(1, 2, 3, 4, 5, 6, 7)) + def test_pass_by_value(self): + # This should mirror the structure in Modules/_ctypes/_ctypes_test.c + class X(Structure): + _fields_ = [ + ('first', c_ulong), + ('second', c_ulong), + ('third', c_ulong), + ] + + s = X() + s.first = 0xdeadbeef + s.second = 0xcafebabe + s.third = 0x0bad1dea + dll = CDLL(_ctypes_test.__file__) + func = dll._testfunc_large_struct_update_value + func.argtypes = (X,) + func.restype = None + func(s) + self.assertEqual(s.first, 0xdeadbeef) + self.assertEqual(s.second, 0xcafebabe) + self.assertEqual(s.third, 0x0bad1dea) + class PointerMemberTestCase(unittest.TestCase): def test(self): diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c index f295c6fc4c69..94678f3189ce 100644 --- a/Modules/_ctypes/_ctypes_test.c +++ b/Modules/_ctypes/_ctypes_test.c @@ -52,6 +52,19 @@ _testfunc_cbk_large_struct(Test in, void (*func)(Test)) func(in); } +/* + * See issue 29565. Update a structure passed by value; + * the caller should not see any change. + */ + +EXPORT(void) +_testfunc_large_struct_update_value(Test in) +{ + in.first = 0x0badf00d; + in.second = 0x0badf00d; + in.third = 0x0badf00d; +} + EXPORT(void)testfunc_array(int values[4]) { printf("testfunc_array %d %d %d %d\n", diff --git a/Modules/_ctypes/libffi_msvc/ffi.c b/Modules/_ctypes/libffi_msvc/ffi.c index 515d802fd894..75dada56133d 100644 --- a/Modules/_ctypes/libffi_msvc/ffi.c +++ b/Modules/_ctypes/libffi_msvc/ffi.c @@ -220,6 +220,16 @@ ffi_call(/*@dependent@*/ ffi_cif *cif, break; #else case FFI_SYSV: + /* If a single argument takes more than 8 bytes, + then a copy is passed by reference. */ + for (unsigned i = 0; i < cif->nargs; i++) { + size_t z = cif->arg_types[i]->size; + if (z > 8) { + void *temp = alloca(z); + memcpy(temp, avalue[i], z); + avalue[i] = temp; + } + } /*@-usedef@*/ return ffi_call_AMD64(ffi_prep_args, &ecif, cif->bytes, cif->flags, ecif.rvalue, fn);

1 0

Add Blurb entry for 3.5.6 final.
by Larry Hastings 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/b86a50f8a04473822cda25dfcadad09e70… commit: b86a50f8a04473822cda25dfcadad09e70f1d810 branch: 3.5 author: Larry Hastings <larry(a)hastings.org> committer: Larry Hastings <larry(a)hastings.org> date: 2018-08-02T02:16:53-07:00 summary: Add Blurb entry for 3.5.6 final. files: A Misc/NEWS.d/3.5.6.rst diff --git a/Misc/NEWS.d/3.5.6.rst b/Misc/NEWS.d/3.5.6.rst new file mode 100644 index 000000000000..b03d965bcac3 --- /dev/null +++ b/Misc/NEWS.d/3.5.6.rst @@ -0,0 +1,8 @@ +.. bpo: 0 +.. date: 2018-08-02 +.. no changes: True +.. nonce: zrt4E5 +.. release date: 2018-08-02 +.. section: Library + +There were no changes between 3.5.6rc1 and 3.5.6 final.

1 0

bpo-34097: Add support for zipping files older than 1980-01-01 (GH-8270)
by Victor Stinner 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/a2fe1e52eb94c41d9ebce1ab284180d7b1… commit: a2fe1e52eb94c41d9ebce1ab284180d7b1faa2a4 branch: master author: Marcel Plch <gmarcel.plch(a)gmail.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2018-08-02T15:04:52+02:00 summary: bpo-34097: Add support for zipping files older than 1980-01-01 (GH-8270) ZipFile can zip files older than 1980-01-01 and newer than 2107-12-31 using a new strict_timestamps parameter at the cost of setting the timestamp to the limit. files: A Misc/NEWS.d/next/Library/2018-07-13-13-42-10.bpo-34097.F5Dk5o.rst M Doc/library/zipfile.rst M Lib/test/test_zipfile.py M Lib/zipfile.py diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst index c0f2a89a3a17..a2fa9666acc1 100644 --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -368,7 +368,7 @@ ZipFile Objects .. method:: ZipFile.write(filename, arcname=None, compress_type=None, \ - compresslevel=None) + compresslevel=None, *, strict_timestamps=True) Write the file named *filename* to the archive, giving it the archive name *arcname* (by default, this will be the same as *filename*, but without a drive @@ -377,6 +377,11 @@ ZipFile Objects the new entry. Similarly, *compresslevel* will override the constructor if given. The archive must be open with mode ``'w'``, ``'x'`` or ``'a'``. + The *strict_timestamps* argument, when set to ``False``, allows to + zip files older than 1980-01-01 at the cost of setting the + timestamp to 1980-01-01. + Similar behavior occurs with files newer than 2107-12-31, + the timestamp is also set to the limit. .. note:: @@ -400,6 +405,9 @@ ZipFile Objects a closed ZipFile will raise a :exc:`ValueError`. Previously, a :exc:`RuntimeError` was raised. + .. versionadded:: 3.8 + The *strict_timestamps* keyword-only argument + .. method:: ZipFile.writestr(zinfo_or_arcname, data, compress_type=None, \ compresslevel=None) @@ -540,7 +548,8 @@ information about a single member of the ZIP archive. There is one classmethod to make a :class:`ZipInfo` instance for a filesystem file: -.. classmethod:: ZipInfo.from_file(filename, arcname=None) +.. classmethod:: ZipInfo.from_file(filename, arcname=None, *, \ + strict_timestamps=True) Construct a :class:`ZipInfo` instance for a file on the filesystem, in preparation for adding it to a zip file. @@ -551,11 +560,20 @@ file: If *arcname* is not specified, the name will be the same as *filename*, but with any drive letter and leading path separators removed. + The *strict_timestamps* argument, when set to ``False``, allows to + zip files older than 1980-01-01 at the cost of setting the + timestamp to 1980-01-01. + Similar behavior occurs with files newer than 2107-12-31, + the timestamp is also set to the limit. + .. versionadded:: 3.6 .. versionchanged:: 3.6.2 The *filename* parameter accepts a :term:`path-like object`. + .. versionadded:: 3.8 + The *strict_timestamps* keyword-only argument + Instances have the following methods and attributes: diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index ac9a4ff6fef0..3b78b7f16759 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -549,6 +549,22 @@ def test_add_file_before_1980(self): with zipfile.ZipFile(TESTFN2, "w") as zipfp: self.assertRaises(ValueError, zipfp.write, TESTFN) + with zipfile.ZipFile(TESTFN2, "w") as zipfp: + zipfp.write(TESTFN, strict_timestamps=False) + zinfo = zipfp.getinfo(TESTFN) + self.assertEqual(zinfo.date_time, (1980, 1, 1, 0, 0, 0)) + + def test_add_file_after_2107(self): + # Set atime and mtime to 2108-12-30 + os.utime(TESTFN, (4386268800, 4386268800)) + with zipfile.ZipFile(TESTFN2, "w") as zipfp: + self.assertRaises(struct.error, zipfp.write, TESTFN) + + with zipfile.ZipFile(TESTFN2, "w") as zipfp: + zipfp.write(TESTFN, strict_timestamps=False) + zinfo = zipfp.getinfo(TESTFN) + self.assertEqual(zinfo.date_time, (2107, 12, 31, 23, 59, 59)) + @requires_zlib class DeflateTestsWithSourceFile(AbstractTestsWithSourceFile, diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 2757ce91cf48..6da1778873dd 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -469,7 +469,7 @@ def _decodeExtra(self): extra = extra[ln+4:] @classmethod - def from_file(cls, filename, arcname=None): + def from_file(cls, filename, arcname=None, *, strict_timestamps=True): """Construct an appropriate ZipInfo for a file on the filesystem. filename should be the path to a file or directory on the filesystem. @@ -484,6 +484,10 @@ def from_file(cls, filename, arcname=None): isdir = stat.S_ISDIR(st.st_mode) mtime = time.localtime(st.st_mtime) date_time = mtime[0:6] + if not strict_timestamps and date_time[0] < 1980: + date_time = (1980, 1, 1, 0, 0, 0) + elif not strict_timestamps and date_time[0] > 2107: + date_time = (2107, 12, 31, 23, 59, 59) # Create ZipInfo instance to store file information if arcname is None: arcname = filename @@ -1673,7 +1677,8 @@ def _writecheck(self, zinfo): " would require ZIP64 extensions") def write(self, filename, arcname=None, - compress_type=None, compresslevel=None): + compress_type=None, compresslevel=None, *, + strict_timestamps=True): """Put the bytes from filename into the archive under the name arcname.""" if not self.fp: @@ -1684,7 +1689,8 @@ def write(self, filename, arcname=None, "Can't write to ZIP archive while an open writing handle exists" ) - zinfo = ZipInfo.from_file(filename, arcname) + zinfo = ZipInfo.from_file(filename, arcname, + strict_timestamps=strict_timestamps) if zinfo.is_dir(): zinfo.compress_size = 0 diff --git a/Misc/NEWS.d/next/Library/2018-07-13-13-42-10.bpo-34097.F5Dk5o.rst b/Misc/NEWS.d/next/Library/2018-07-13-13-42-10.bpo-34097.F5Dk5o.rst new file mode 100644 index 000000000000..397149559af5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-07-13-13-42-10.bpo-34097.F5Dk5o.rst @@ -0,0 +1,3 @@ +ZipFile can zip files older than 1980-01-01 and newer than 2107-12-31 using +a new ``strict_timestamps`` parameter at the cost of setting the timestamp +to the limit.

1 0

bpo-34287: Do not use second argument of METH_NOARGS functions (GH-8582)
by INADA Naoki 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/fc512e3e0663f7f325862fcd42aef765fd… commit: fc512e3e0663f7f325862fcd42aef765fd34a453 branch: master author: jdemeyer <jdemeyer(a)cage.ugent.be> committer: INADA Naoki <methane(a)users.noreply.github.com> date: 2018-08-02T20:14:54+09:00 summary: bpo-34287: Do not use second argument of METH_NOARGS functions (GH-8582) files: M Modules/_io/bufferedio.c diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 358a654a98ca..9d3b4466493c 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -403,7 +403,7 @@ buffered_dealloc(buffered *self) } static PyObject * -buffered_sizeof(buffered *self, void *unused) +buffered_sizeof(buffered *self, PyObject *Py_UNUSED(ignored)) { Py_ssize_t res; @@ -540,7 +540,7 @@ buffered_close(buffered *self, PyObject *args) /* detach */ static PyObject * -buffered_detach(buffered *self, PyObject *args) +buffered_detach(buffered *self, PyObject *Py_UNUSED(ignored)) { PyObject *raw, *res; CHECK_INITIALIZED(self) @@ -558,21 +558,21 @@ buffered_detach(buffered *self, PyObject *args) /* Inquiries */ static PyObject * -buffered_seekable(buffered *self, PyObject *args) +buffered_seekable(buffered *self, PyObject *Py_UNUSED(ignored)) { CHECK_INITIALIZED(self) return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_seekable, NULL); } static PyObject * -buffered_readable(buffered *self, PyObject *args) +buffered_readable(buffered *self, PyObject *Py_UNUSED(ignored)) { CHECK_INITIALIZED(self) return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_readable, NULL); } static PyObject * -buffered_writable(buffered *self, PyObject *args) +buffered_writable(buffered *self, PyObject *Py_UNUSED(ignored)) { CHECK_INITIALIZED(self) return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_writable, NULL); @@ -595,14 +595,14 @@ buffered_mode_get(buffered *self, void *context) /* Lower-level APIs */ static PyObject * -buffered_fileno(buffered *self, PyObject *args) +buffered_fileno(buffered *self, PyObject *Py_UNUSED(ignored)) { CHECK_INITIALIZED(self) return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_fileno, NULL); } static PyObject * -buffered_isatty(buffered *self, PyObject *args) +buffered_isatty(buffered *self, PyObject *Py_UNUSED(ignored)) { CHECK_INITIALIZED(self) return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_isatty, NULL); @@ -611,7 +611,7 @@ buffered_isatty(buffered *self, PyObject *args) /* Serialization */ static PyObject * -buffered_getstate(buffered *self, PyObject *args) +buffered_getstate(buffered *self, PyObject *Py_UNUSED(ignored)) { PyErr_Format(PyExc_TypeError, "cannot serialize '%s' object", Py_TYPE(self)->tp_name); @@ -1202,7 +1202,7 @@ _io__Buffered_readline_impl(buffered *self, Py_ssize_t size) static PyObject * -buffered_tell(buffered *self, PyObject *args) +buffered_tell(buffered *self, PyObject *Py_UNUSED(ignored)) { Py_off_t pos; @@ -2207,33 +2207,33 @@ bufferedrwpair_write(rwpair *self, PyObject *args) } static PyObject * -bufferedrwpair_flush(rwpair *self, PyObject *args) +bufferedrwpair_flush(rwpair *self, PyObject *Py_UNUSED(ignored)) { - return _forward_call(self->writer, &PyId_flush, args); + return _forward_call(self->writer, &PyId_flush, NULL); } static PyObject * -bufferedrwpair_readable(rwpair *self, PyObject *args) +bufferedrwpair_readable(rwpair *self, PyObject *Py_UNUSED(ignored)) { - return _forward_call(self->reader, &PyId_readable, args); + return _forward_call(self->reader, &PyId_readable, NULL); } static PyObject * -bufferedrwpair_writable(rwpair *self, PyObject *args) +bufferedrwpair_writable(rwpair *self, PyObject *Py_UNUSED(ignored)) { - return _forward_call(self->writer, &PyId_writable, args); + return _forward_call(self->writer, &PyId_writable, NULL); } static PyObject * -bufferedrwpair_close(rwpair *self, PyObject *args) +bufferedrwpair_close(rwpair *self, PyObject *Py_UNUSED(ignored)) { PyObject *exc = NULL, *val, *tb; - PyObject *ret = _forward_call(self->writer, &PyId_close, args); + PyObject *ret = _forward_call(self->writer, &PyId_close, NULL); if (ret == NULL) PyErr_Fetch(&exc, &val, &tb); else Py_DECREF(ret); - ret = _forward_call(self->reader, &PyId_close, args); + ret = _forward_call(self->reader, &PyId_close, NULL); if (exc != NULL) { _PyErr_ChainExceptions(exc, val, tb); Py_CLEAR(ret); @@ -2242,9 +2242,9 @@ bufferedrwpair_close(rwpair *self, PyObject *args) } static PyObject * -bufferedrwpair_isatty(rwpair *self, PyObject *args) +bufferedrwpair_isatty(rwpair *self, PyObject *Py_UNUSED(ignored)) { - PyObject *ret = _forward_call(self->writer, &PyId_isatty, args); + PyObject *ret = _forward_call(self->writer, &PyId_isatty, NULL); if (ret != Py_False) { /* either True or exception */ @@ -2252,7 +2252,7 @@ bufferedrwpair_isatty(rwpair *self, PyObject *args) } Py_DECREF(ret); - return _forward_call(self->reader, &PyId_isatty, args); + return _forward_call(self->reader, &PyId_isatty, NULL); } static PyObject *

1 0

Daily reference leaks (4243df51fe43): sum=-2
by solipsis＠pitrou.net 02 Aug '18

02 Aug '18

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [-7, 1, 0] memory blocks, sum=-6 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/reflogBPJGbd', '--timeout', '7200']

1 0

bpo-34120: fix text viewer to call grab_release() only when needed (GH-8616)
by Miss Islington (bot) 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/8c4a0059accb5cb33e90ec5b2f3e9dc08e… commit: 8c4a0059accb5cb33e90ec5b2f3e9dc08e2f3048 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-08-02T01:31:14-07:00 summary: bpo-34120: fix text viewer to call grab_release() only when needed (GH-8616) (cherry picked from commit dd74369cb7b230b07ac3a031563406c8f2aae17f) Co-authored-by: Tal Einat <taleinat+github(a)gmail.com> files: M Lib/idlelib/textview.py diff --git a/Lib/idlelib/textview.py b/Lib/idlelib/textview.py index e78e297ab993..75b24703b4c3 100644 --- a/Lib/idlelib/textview.py +++ b/Lib/idlelib/textview.py @@ -83,7 +83,8 @@ def __init__(self, parent, title, text, modal=True, command=self.ok, takefocus=False) self.viewframe.pack(side='top', expand=True, fill='both') - if modal: + self.is_modal = modal + if self.is_modal: self.transient(parent) self.grab_set() if not _utest: @@ -91,7 +92,8 @@ def __init__(self, parent, title, text, modal=True, def ok(self, event=None): """Dismiss text viewer dialog.""" - self.grab_release() + if self.is_modal: + self.grab_release() self.destroy()

1 0

bpo-34120: fix text viewer to call grab_release() only when needed (GH-8616)
by Miss Islington (bot) 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/60586de02de074a33c015e5a013d85d0b1… commit: 60586de02de074a33c015e5a013d85d0b17e7e61 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-08-02T00:52:22-07:00 summary: bpo-34120: fix text viewer to call grab_release() only when needed (GH-8616) (cherry picked from commit dd74369cb7b230b07ac3a031563406c8f2aae17f) Co-authored-by: Tal Einat <taleinat+github(a)gmail.com> files: M Lib/idlelib/textview.py diff --git a/Lib/idlelib/textview.py b/Lib/idlelib/textview.py index e78e297ab993..75b24703b4c3 100644 --- a/Lib/idlelib/textview.py +++ b/Lib/idlelib/textview.py @@ -83,7 +83,8 @@ def __init__(self, parent, title, text, modal=True, command=self.ok, takefocus=False) self.viewframe.pack(side='top', expand=True, fill='both') - if modal: + self.is_modal = modal + if self.is_modal: self.transient(parent) self.grab_set() if not _utest: @@ -91,7 +92,8 @@ def __init__(self, parent, title, text, modal=True, def ok(self, event=None): """Dismiss text viewer dialog.""" - self.grab_release() + if self.is_modal: + self.grab_release() self.destroy()

1 0

bpo-34120: fix text viewer to call grab_release() only when needed (GH-8616)
by Tal Einat 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/dd74369cb7b230b07ac3a031563406c8f2… commit: dd74369cb7b230b07ac3a031563406c8f2aae17f branch: master author: Tal Einat <taleinat+github(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-08-02T10:30:06+03:00 summary: bpo-34120: fix text viewer to call grab_release() only when needed (GH-8616) files: M Lib/idlelib/textview.py diff --git a/Lib/idlelib/textview.py b/Lib/idlelib/textview.py index e78e297ab993..75b24703b4c3 100644 --- a/Lib/idlelib/textview.py +++ b/Lib/idlelib/textview.py @@ -83,7 +83,8 @@ def __init__(self, parent, title, text, modal=True, command=self.ok, takefocus=False) self.viewframe.pack(side='top', expand=True, fill='both') - if modal: + self.is_modal = modal + if self.is_modal: self.transient(parent) self.grab_set() if not _utest: @@ -91,7 +92,8 @@ def __init__(self, parent, title, text, modal=True, def ok(self, event=None): """Dismiss text viewer dialog.""" - self.grab_release() + if self.is_modal: + self.grab_release() self.destroy()

1 0

[2.7] bpo-34120: fix IDLE freezing after closing dialogs (GH-8603)
by Tal Einat 02 Aug '18

02 Aug '18

https://github.com/python/cpython/commit/894940b1099677c1ca0aa527dbb935e47d… commit: 894940b1099677c1ca0aa527dbb935e47d3d591a branch: 2.7 author: Tal Einat <taleinat+github(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-08-02T10:21:49+03:00 summary: [2.7] bpo-34120: fix IDLE freezing after closing dialogs (GH-8603) Added missing .grab_release() calls to all places where we call .grab_set(). (cherry picked from commit 10ea9409ceb5da83cb380b610750551e26561044) files: A Misc/NEWS.d/next/IDLE/2018-08-01-23-25-38.bpo-34120.HgsIz-.rst M Lib/idlelib/aboutDialog.py M Lib/idlelib/configDialog.py M Lib/idlelib/configHelpSourceEdit.py M Lib/idlelib/configSectionNameDialog.py M Lib/idlelib/idle_test/test_config_name.py M Lib/idlelib/keybindingDialog.py M Lib/idlelib/textView.py diff --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/aboutDialog.py index c9adc08bb2fc..87d6c3cb9c08 100644 --- a/Lib/idlelib/aboutDialog.py +++ b/Lib/idlelib/aboutDialog.py @@ -141,6 +141,7 @@ def display_file_text(self, title, filename, encoding=None): textView.view_file(self, title, fn, encoding) def Ok(self, event=None): + self.grab_release() self.destroy() if __name__ == '__main__': diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py index d53f5ff2008d..3c29af13763c 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -1197,10 +1197,12 @@ def ActivateConfigChanges(self): instance.reset_help_menu_entries() def Cancel(self): + self.grab_release() self.destroy() def Ok(self): self.Apply() + self.grab_release() self.destroy() def Apply(self): diff --git a/Lib/idlelib/configHelpSourceEdit.py b/Lib/idlelib/configHelpSourceEdit.py index 5816449caf5e..62b010a0ca20 100644 --- a/Lib/idlelib/configHelpSourceEdit.py +++ b/Lib/idlelib/configHelpSourceEdit.py @@ -155,10 +155,12 @@ def Ok(self, event=None): # Mac Safari insists on using the URI form for local files self.result = list(self.result) self.result[1] = "file://" + path + self.grab_release() self.destroy() def Cancel(self, event=None): self.result = None + self.grab_release() self.destroy() if __name__ == '__main__': diff --git a/Lib/idlelib/configSectionNameDialog.py b/Lib/idlelib/configSectionNameDialog.py index c09dca896b0c..f28dc1a28363 100644 --- a/Lib/idlelib/configSectionNameDialog.py +++ b/Lib/idlelib/configSectionNameDialog.py @@ -80,10 +80,13 @@ def Ok(self, event=None): name = self.name_ok() if name: self.result = name + self.grab_release() self.destroy() def Cancel(self, event=None): self.result = '' + self.grab_release() self.destroy() + if __name__ == '__main__': import unittest unittest.main('idlelib.idle_test.test_config_name', verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_config_name.py b/Lib/idlelib/idle_test/test_config_name.py index 4403f87fd3b1..2a4df6a74458 100644 --- a/Lib/idlelib/idle_test/test_config_name.py +++ b/Lib/idlelib/idle_test/test_config_name.py @@ -15,6 +15,8 @@ class Dummy_name_dialog(object): name = Var() result = None destroyed = False + def grab_release(self): + pass def destroy(self): self.destroyed = True diff --git a/Lib/idlelib/keybindingDialog.py b/Lib/idlelib/keybindingDialog.py index 4d32ca947698..755f1af47e21 100644 --- a/Lib/idlelib/keybindingDialog.py +++ b/Lib/idlelib/keybindingDialog.py @@ -217,10 +217,12 @@ def TranslateKey(self, key, modifiers): def OK(self, event=None): if self.advanced or self.KeysOK(): # doesn't check advanced string yet self.result=self.keyString.get() + self.grab_release() self.destroy() def Cancel(self, event=None): self.result='' + self.grab_release() self.destroy() def KeysOK(self): diff --git a/Lib/idlelib/textView.py b/Lib/idlelib/textView.py index b8c4ac1821d7..ec837f810c30 100644 --- a/Lib/idlelib/textView.py +++ b/Lib/idlelib/textView.py @@ -39,7 +39,8 @@ def __init__(self, parent, title, text, modal=True, _htest=False): self.textView.insert(0.0, text) self.textView.config(state=DISABLED) - if modal: + self.is_modal = modal + if self.is_modal: self.transient(parent) self.grab_set() self.wait_window() @@ -62,6 +63,8 @@ def CreateWidgets(self): frameText.pack(side=TOP,expand=TRUE,fill=BOTH) def Ok(self, event=None): + if self.is_modal: + self.grab_release() self.destroy() diff --git a/Misc/NEWS.d/next/IDLE/2018-08-01-23-25-38.bpo-34120.HgsIz-.rst b/Misc/NEWS.d/next/IDLE/2018-08-01-23-25-38.bpo-34120.HgsIz-.rst new file mode 100644 index 000000000000..f9954f7c1af0 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-08-01-23-25-38.bpo-34120.HgsIz-.rst @@ -0,0 +1 @@ +Fix unresponsiveness after closing certain windows and dialogs. \ No newline at end of file

1 0