Mailman 3 August 2014 - Python-checkins

cpython (2.7): properly handle file closing in error cases (closes #22266)
by benjamin.peterson Aug. 27, 2014

Aug. 27, 2014

http://hg.python.org/cpython/rev/6f0dae921bee changeset: 92255:6f0dae921bee branch: 2.7 parent: 92244:37ebb0d44808 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Aug 27 20:31:21 2014 -0400 summary: properly handle file closing in error cases (closes #22266) files: Lib/tarfile.py | 77 +++++++++++++++++++++++-------------- 1 files changed, 48 insertions(+), 29 deletions(-) diff --git a/Lib/tarfile.py b/Lib/tarfile.py --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -417,28 +417,34 @@ self.pos = 0L self.closed = False - if comptype == "gz": - try: - import zlib - except ImportError: - raise CompressionError("zlib module is not available") - self.zlib = zlib - self.crc = zlib.crc32("") & 0xffffffffL - if mode == "r": - self._init_read_gz() - else: - self._init_write_gz() + try: + if comptype == "gz": + try: + import zlib + except ImportError: + raise CompressionError("zlib module is not available") + self.zlib = zlib + self.crc = zlib.crc32("") & 0xffffffffL + if mode == "r": + self._init_read_gz() + else: + self._init_write_gz() - if comptype == "bz2": - try: - import bz2 - except ImportError: - raise CompressionError("bz2 module is not available") - if mode == "r": - self.dbuf = "" - self.cmp = bz2.BZ2Decompressor() - else: - self.cmp = bz2.BZ2Compressor() + elif comptype == "bz2": + try: + import bz2 + except ImportError: + raise CompressionError("bz2 module is not available") + if mode == "r": + self.dbuf = "" + self.cmp = bz2.BZ2Decompressor() + else: + self.cmp = bz2.BZ2Compressor() + except: + if not self._extfileobj: + self.fileobj.close() + self.closed = True + raise def __del__(self): if hasattr(self, "closed") and not self.closed: @@ -1685,9 +1691,12 @@ if filemode not in ("r", "w"): raise ValueError("mode must be 'r' or 'w'") - t = cls(name, filemode, - _Stream(name, filemode, comptype, fileobj, bufsize), - **kwargs) + stream = _Stream(name, filemode, comptype, fileobj, bufsize) + try: + t = cls(name, filemode, stream, **kwargs) + except: + stream.close() + raise t._extfileobj = False return t @@ -1718,17 +1727,23 @@ except (ImportError, AttributeError): raise CompressionError("gzip module is not available") - if fileobj is None: - fileobj = bltn_open(name, mode + "b") + try: + fileobj = gzip.GzipFile(name, mode, compresslevel, fileobj) + except OSError: + if fileobj is not None and mode == 'r': + raise ReadError("not a gzip file") + raise try: - t = cls.taropen(name, mode, - gzip.GzipFile(name, mode, compresslevel, fileobj), - **kwargs) + t = cls.taropen(name, mode, fileobj, **kwargs) except IOError: + fileobj.close() if mode == 'r': raise ReadError("not a gzip file") raise + except: + fileobj.close() + raise t._extfileobj = False return t @@ -1753,9 +1768,13 @@ try: t = cls.taropen(name, mode, fileobj, **kwargs) except (IOError, EOFError): + fileobj.close() if mode == 'r': raise ReadError("not a bzip2 file") raise + except: + fileobj.close() + raise t._extfileobj = False return t -- Repository URL: http://hg.python.org/cpython

1 0

peps: PEP 475: fix typos
by victor.stinner Aug. 27, 2014

Aug. 27, 2014

http://hg.python.org/peps/rev/24d9bf44d671 changeset: 5526:24d9bf44d671 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Aug 27 23:17:15 2014 +0200 summary: PEP 475: fix typos files: pep-0475.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pep-0475.txt b/pep-0475.txt --- a/pep-0475.txt +++ b/pep-0475.txt @@ -135,7 +135,7 @@ ``SIGINT`` * Use a I/O multiplexing function like ``select()`` with the Python signal "wakeup" file descriptor: see the function - ``signal.set_wakeupfd()``. + ``signal.set_wakeup_fd()``. Proposition @@ -184,14 +184,14 @@ race conditions (deadlock if the signal comes before the system call). These applications must be fixed to handle signals differently, to have a reliable behaviour on all platforms and all Python versions. -For example, use a signal handle which raises an exception, or use a +For example, use a signal handler which raises an exception, or use a wakeup file descriptor. For applications using event loops, ``signal.set_wakeup_fd()`` is the recommanded option to handle signals. The signal handler writes signal numbers into the file descriptor and the event loop is awaken to read -them. The event loop can decide how to handle these signals without -the restriction of signal handlers. +them. The event loop can handle these signals without the restriction +of signal handlers. Appendix -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 3.4 -> default): The webbrowser module now uses subprocess's start_new_session=True rather
by gregory.p.smith Aug. 27, 2014

Aug. 27, 2014

http://hg.python.org/cpython/rev/fb3aee1cff59 changeset: 92254:fb3aee1cff59 parent: 92252:f5f5553f219e parent: 92253:a48ef19911ea user: Gregory P. Smith <greg(a)krypto.org> date: Wed Aug 27 09:41:05 2014 -0700 summary: The webbrowser module now uses subprocess's start_new_session=True rather than a potentially risky preexec_fn=os.setsid call. files: Lib/webbrowser.py | 15 ++++----------- Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -159,10 +159,8 @@ if sys.platform[:3] == 'win': p = subprocess.Popen(cmdline) else: - setsid = getattr(os, 'setsid', None) - if not setsid: - setsid = getattr(os, 'setpgrp', None) - p = subprocess.Popen(cmdline, close_fds=True, preexec_fn=setsid) + p = subprocess.Popen(cmdline, close_fds=True, + start_new_session=True) return (p.poll() is None) except OSError: return False @@ -321,11 +319,6 @@ action = "openURL" devnull = subprocess.DEVNULL - # if possible, put browser in separate process group, so - # keyboard interrupts don't affect browser as well as Python - setsid = getattr(os, 'setsid', None) - if not setsid: - setsid = getattr(os, 'setpgrp', None) try: p = subprocess.Popen(["kfmclient", action, url], @@ -343,7 +336,7 @@ p = subprocess.Popen(["konqueror", "--silent", url], close_fds=True, stdin=devnull, stdout=devnull, stderr=devnull, - preexec_fn=setsid) + start_new_session=True) except OSError: # fall through to next variant pass @@ -356,7 +349,7 @@ p = subprocess.Popen(["kfm", "-d", url], close_fds=True, stdin=devnull, stdout=devnull, stderr=devnull, - preexec_fn=setsid) + start_new_session=True) except OSError: return False else: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -124,6 +124,9 @@ Library ------- +- The webbrowser module now uses subprocess's start_new_session=True rather + than a potentially risky preexec_fn=os.setsid call. + - Issue #22042: signal.set_wakeup_fd(fd) now raises an exception if the file descriptor is in blocking mode. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): The webbrowser module now uses subprocess's start_new_session=True rather
by gregory.p.smith Aug. 27, 2014

Aug. 27, 2014

http://hg.python.org/cpython/rev/a48ef19911ea changeset: 92253:a48ef19911ea branch: 3.4 parent: 92249:a94d9c981461 user: Gregory P. Smith <greg(a)krypto.org> date: Wed Aug 27 09:34:38 2014 -0700 summary: The webbrowser module now uses subprocess's start_new_session=True rather than a potentially risky preexec_fn=os.setsid call. files: Lib/webbrowser.py | 15 ++++----------- Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -159,10 +159,8 @@ if sys.platform[:3] == 'win': p = subprocess.Popen(cmdline) else: - setsid = getattr(os, 'setsid', None) - if not setsid: - setsid = getattr(os, 'setpgrp', None) - p = subprocess.Popen(cmdline, close_fds=True, preexec_fn=setsid) + p = subprocess.Popen(cmdline, close_fds=True, + start_new_session=True) return (p.poll() is None) except OSError: return False @@ -321,11 +319,6 @@ action = "openURL" devnull = subprocess.DEVNULL - # if possible, put browser in separate process group, so - # keyboard interrupts don't affect browser as well as Python - setsid = getattr(os, 'setsid', None) - if not setsid: - setsid = getattr(os, 'setpgrp', None) try: p = subprocess.Popen(["kfmclient", action, url], @@ -343,7 +336,7 @@ p = subprocess.Popen(["konqueror", "--silent", url], close_fds=True, stdin=devnull, stdout=devnull, stderr=devnull, - preexec_fn=setsid) + start_new_session=True) except OSError: # fall through to next variant pass @@ -356,7 +349,7 @@ p = subprocess.Popen(["kfm", "-d", url], close_fds=True, stdin=devnull, stdout=devnull, stderr=devnull, - preexec_fn=setsid) + start_new_session=True) except OSError: return False else: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -27,6 +27,9 @@ Library ------- +- The webbrowser module now uses subprocess's start_new_session=True rather + than a potentially risky preexec_fn=os.setsid call. + - Issue #22236: Fixed Tkinter images copying operations in NoDefaultRoot mode. - Issue #22191: Fix warnings.__all__. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #22042: Fix test_signal on Windows
by victor.stinner Aug. 27, 2014

Aug. 27, 2014

http://hg.python.org/cpython/rev/f5f5553f219e changeset: 92252:f5f5553f219e user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Aug 27 14:02:36 2014 +0200 summary: Issue #22042: Fix test_signal on Windows files: Lib/test/test_signal.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -271,8 +271,9 @@ self.addCleanup(os.close, r2) self.addCleanup(os.close, w2) - os.set_blocking(w1, False) - os.set_blocking(w2, False) + if hasattr(os, 'set_blocking'): + os.set_blocking(w1, False) + os.set_blocking(w2, False) signal.set_wakeup_fd(w1) self.assertEqual(signal.set_wakeup_fd(w2), w1) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #22042: signal.set_wakeup_fd(fd) now raises an exception if the file
by victor.stinner Aug. 27, 2014

Aug. 27, 2014

http://hg.python.org/cpython/rev/d984dfe8c34e changeset: 92251:d984dfe8c34e user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Aug 27 12:59:44 2014 +0200 summary: Issue #22042: signal.set_wakeup_fd(fd) now raises an exception if the file descriptor is in blocking mode. files: Lib/test/test_signal.py | 25 +++++++++++++++++++++++++ Misc/NEWS | 3 +++ Modules/signalmodule.c | 20 +++++++++++++++++++- 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -271,6 +271,9 @@ self.addCleanup(os.close, r2) self.addCleanup(os.close, w2) + os.set_blocking(w1, False) + os.set_blocking(w2, False) + signal.set_wakeup_fd(w1) self.assertEqual(signal.set_wakeup_fd(w2), w1) self.assertEqual(signal.set_wakeup_fd(-1), w2) @@ -279,10 +282,12 @@ def test_set_wakeup_fd_socket_result(self): sock1 = socket.socket() self.addCleanup(sock1.close) + sock1.setblocking(False) fd1 = sock1.fileno() sock2 = socket.socket() self.addCleanup(sock2.close) + sock2.setblocking(False) fd2 = sock2.fileno() signal.set_wakeup_fd(fd1) @@ -290,6 +295,26 @@ self.assertEqual(signal.set_wakeup_fd(-1), fd2) self.assertEqual(signal.set_wakeup_fd(-1), -1) + # On Windows, files are always blocking and Windows does not provide a + # function to test if a socket is in non-blocking mode. + @unittest.skipIf(sys.platform == "win32", "tests specific to POSIX") + def test_set_wakeup_fd_blocking(self): + rfd, wfd = os.pipe() + self.addCleanup(os.close, rfd) + self.addCleanup(os.close, wfd) + + # fd must be non-blocking + os.set_blocking(wfd, True) + with self.assertRaises(ValueError) as cm: + signal.set_wakeup_fd(wfd) + self.assertEqual(str(cm.exception), + "the fd %s must be in non-blocking mode" % wfd) + + # non-blocking is ok + os.set_blocking(wfd, False) + signal.set_wakeup_fd(wfd) + signal.set_wakeup_fd(-1) + @unittest.skipIf(sys.platform == "win32", "Not valid on Windows") class WakeupSignalTests(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -124,6 +124,9 @@ Library ------- +- Issue #22042: signal.set_wakeup_fd(fd) now raises an exception if the file + descriptor is in blocking mode. + - Issue #16808: inspect.stack() now returns a named tuple instead of a tuple. Patch by Daniel Shahaf. diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -561,9 +561,15 @@ PyErr_SetFromErrno(PyExc_OSError); return NULL; } + + /* on Windows, a file cannot be set to non-blocking mode */ } - else + else { is_socket = 1; + + /* Windows does not provide a function to test if a socket + is in non-blocking mode */ + } } old_fd = wakeup.fd; @@ -576,6 +582,8 @@ return PyLong_FromLong(-1); #else if (fd != -1) { + int blocking; + if (!_PyVerify_fd(fd)) { PyErr_SetString(PyExc_ValueError, "invalid fd"); return NULL; @@ -585,6 +593,16 @@ PyErr_SetFromErrno(PyExc_OSError); return NULL; } + + blocking = _Py_get_blocking(fd); + if (blocking < 0) + return NULL; + if (blocking) { + PyErr_Format(PyExc_ValueError, + "the fd %i must be in non-blocking mode", + fd); + return NULL; + } } old_fd = wakeup_fd; -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (0337a460f05b): sum=20998
by solipsis＠pitrou.net Aug. 27, 2014

Aug. 27, 2014

results for 0337a460f05b on branch "default" -------------------------------------------- test_codecs leaked [5825, 5825, 5825] references, sum=17475 test_codecs leaked [1172, 1174, 1174] memory blocks, sum=3520 test_functools leaked [0, 0, 3] memory blocks, sum=3 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog4xQmeV', '-x']

1 0

cpython (merge 3.4 -> default): Merge with 3.4
by terry.reedy Aug. 26, 2014

Aug. 26, 2014

http://hg.python.org/cpython/rev/6d8e01f2169c changeset: 92250:6d8e01f2169c parent: 92248:088cfde9af06 parent: 92249:a94d9c981461 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Wed Aug 27 01:58:57 2014 -0400 summary: Merge with 3.4 files: Lib/turtledemo/__main__.py | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -180,7 +180,7 @@ self.exitflag = False if filename: self.loadfile(filename) - self.configGUI(NORMAL, DISABLED, DISABLED, DISABLED, + self.configGUI(DISABLED, DISABLED, DISABLED, "Choose example from menu", "black") self.state = STARTUP @@ -225,9 +225,7 @@ turtle.RawTurtle.screens = [_s_] return canvas - def configGUI(self, menu, start, stop, clear, txt="", color="blue"): - self.mBar.entryconfigure(0, state=menu) - + def configGUI(self, start, stop, clear, txt="", color="blue"): self.start_btn.config(state=start, bg="#d00" if start == NORMAL else "#fca") self.stop_btn.config(state=stop, @@ -276,7 +274,7 @@ self.text.insert("1.0", chars) self.root.title(filename + " - a Python turtle graphics example") reload(self.module) - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, + self.configGUI(NORMAL, DISABLED, DISABLED, "Press start button", "red") self.state = READY @@ -284,7 +282,7 @@ self.refreshCanvas() self.dirty = True turtle.TurtleScreen._RUNNING = True - self.configGUI(DISABLED, DISABLED, NORMAL, DISABLED, + self.configGUI(DISABLED, NORMAL, DISABLED, "demo running...", "black") self.screen.clear() self.screen.mode("standard") @@ -300,24 +298,24 @@ self.state = DONE result = "stopped!" if self.state == DONE: - self.configGUI(NORMAL, NORMAL, DISABLED, NORMAL, + self.configGUI(NORMAL, DISABLED, NORMAL, result) elif self.state == EVENTDRIVEN: self.exitflag = True - self.configGUI(DISABLED, DISABLED, NORMAL, DISABLED, + self.configGUI(DISABLED, NORMAL, DISABLED, "use mouse/keys or STOP", "red") def clearCanvas(self): self.refreshCanvas() self.screen._delete("all") self.scanvas.config(cursor="") - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED) + self.configGUI(NORMAL, DISABLED, DISABLED) def stopIt(self): if self.exitflag: self.clearCanvas() self.exitflag = False - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, + self.configGUI(NORMAL, DISABLED, DISABLED, "STOPPED!", "red") turtle.TurtleScreen._RUNNING = False -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #22065: Remove the now unsed configGUI menu parameter and arguments.
by terry.reedy Aug. 26, 2014

Aug. 26, 2014

http://hg.python.org/cpython/rev/a94d9c981461 changeset: 92249:a94d9c981461 branch: 3.4 parent: 92247:b671092e08fa user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Wed Aug 27 01:58:40 2014 -0400 summary: Issue #22065: Remove the now unsed configGUI menu parameter and arguments. files: Lib/turtledemo/__main__.py | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -180,7 +180,7 @@ self.exitflag = False if filename: self.loadfile(filename) - self.configGUI(NORMAL, DISABLED, DISABLED, DISABLED, + self.configGUI(DISABLED, DISABLED, DISABLED, "Choose example from menu", "black") self.state = STARTUP @@ -225,9 +225,7 @@ turtle.RawTurtle.screens = [_s_] return canvas - def configGUI(self, menu, start, stop, clear, txt="", color="blue"): - self.mBar.entryconfigure(0, state=menu) - + def configGUI(self, start, stop, clear, txt="", color="blue"): self.start_btn.config(state=start, bg="#d00" if start == NORMAL else "#fca") self.stop_btn.config(state=stop, @@ -276,7 +274,7 @@ self.text.insert("1.0", chars) self.root.title(filename + " - a Python turtle graphics example") reload(self.module) - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, + self.configGUI(NORMAL, DISABLED, DISABLED, "Press start button", "red") self.state = READY @@ -284,7 +282,7 @@ self.refreshCanvas() self.dirty = True turtle.TurtleScreen._RUNNING = True - self.configGUI(DISABLED, DISABLED, NORMAL, DISABLED, + self.configGUI(DISABLED, NORMAL, DISABLED, "demo running...", "black") self.screen.clear() self.screen.mode("standard") @@ -300,24 +298,24 @@ self.state = DONE result = "stopped!" if self.state == DONE: - self.configGUI(NORMAL, NORMAL, DISABLED, NORMAL, + self.configGUI(NORMAL, DISABLED, NORMAL, result) elif self.state == EVENTDRIVEN: self.exitflag = True - self.configGUI(DISABLED, DISABLED, NORMAL, DISABLED, + self.configGUI(DISABLED, NORMAL, DISABLED, "use mouse/keys or STOP", "red") def clearCanvas(self): self.refreshCanvas() self.screen._delete("all") self.scanvas.config(cursor="") - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED) + self.configGUI(NORMAL, DISABLED, DISABLED) def stopIt(self): if self.exitflag: self.clearCanvas() self.exitflag = False - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, + self.configGUI(NORMAL, DISABLED, DISABLED, "STOPPED!", "red") turtle.TurtleScreen._RUNNING = False -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Merge with 3.4
by terry.reedy Aug. 26, 2014

Aug. 26, 2014

http://hg.python.org/cpython/rev/088cfde9af06 changeset: 92248:088cfde9af06 parent: 92246:0337a460f05b parent: 92247:b671092e08fa user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Wed Aug 27 01:44:13 2014 -0400 summary: Merge with 3.4 files: Lib/turtledemo/__main__.py | 13 ++++++------- Lib/turtledemo/nim.py | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -260,12 +260,13 @@ return menu def refreshCanvas(self): - if not self.dirty: return - self.screen.clear() - self.dirty=False + if self.dirty: + self.screen.clear() + self.dirty=False def loadfile(self, filename): - self.refreshCanvas() + self.clearCanvas() + turtle.TurtleScreen._RUNNING = False modname = 'turtledemo.' + filename __import__(modname) self.module = sys.modules[modname] @@ -318,9 +319,7 @@ self.exitflag = False self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, "STOPPED!", "red") - turtle.TurtleScreen._RUNNING = False - else: - turtle.TurtleScreen._RUNNING = False + turtle.TurtleScreen._RUNNING = False def _destroy(self): self.root.destroy() diff --git a/Lib/turtledemo/nim.py b/Lib/turtledemo/nim.py --- a/Lib/turtledemo/nim.py +++ b/Lib/turtledemo/nim.py @@ -219,7 +219,7 @@ mainscreen.mode("standard") mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) nim = Nim(mainscreen) - return "EVENTLOOP!" + return "EVENTLOOP" if __name__ == "__main__": main() -- Repository URL: http://hg.python.org/cpython

1 0