diff options
| author | Ned Deily <nad@acm.org> | 2014-11-02 02:33:25 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2014-11-02 02:33:25 (GMT) |
| commit | 048345d4174254a1d70eb4aa09109dddee858223 (patch) | |
| tree | 427390fda81d13dc2807464f9e2d4638609aee77 /Lib | |
| parent | e470d092cb8ea1fc6a3d528f40799dca9cf86f17 (diff) | |
| parent | 91f01e175a4f8f21893401573bdc36c5004388dd (diff) | |
| download | cpython-048345d4174254a1d70eb4aa09109dddee858223.zip cpython-048345d4174254a1d70eb4aa09109dddee858223.tar.gz cpython-048345d4174254a1d70eb4aa09109dddee858223.tar.bz2 | |
Issue #22770: merge from 3.4
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/support/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index adebedd..a64ed56 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -461,12 +461,11 @@ def _is_gui_available(): 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) |