[Python-checkins] cpython (merge 3.4 -> default): Issue #22770: merge from 3.4

ned.deily python-checkins at python.org
Sun Nov 2 03:34:01 CET 2014


https://hg.python.org/cpython/rev/e119343bc3ec
changeset:   93344:e119343bc3ec
parent:      93341:ef15b51d59fb
parent:      93343:121517deb318
user:        Ned Deily <nad at acm.org>
date:        Sat Nov 01 19:33:25 2014 -0700
summary:
  Issue #22770: merge from 3.4

files:
  Lib/test/support/__init__.py |  5 ++---
  Misc/NEWS                    |  2 ++
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -461,12 +461,11 @@
                 reason = "cannot run without OS X gui process"
 
     # check on every platform whether tkinter can actually do anything
-    # but skip the test on OS X because it can cause segfaults in Cocoa Tk
-    # when running regrtest with the -j option (multiple threads/subprocesses)
-    if (not reason) and (sys.platform != 'darwin'):
+    if not reason:
         try:
             from tkinter import Tk
             root = Tk()
+            root.update()
             root.destroy()
         except Exception as e:
             err_string = str(e)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1342,6 +1342,8 @@
 - Issue #21093: Prevent failures of ctypes test_macholib on OS X if a
   copy of libz exists in $HOME/lib or /usr/local/lib.
 
+- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
+
 Tools/Demos
 -----------
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list