diff options
author | Ned Deily <nad@acm.org> | 2011-01-30 00:18:47 (GMT) |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2011-01-30 00:18:47 (GMT) |
commit | 2a6f4b33271742f66a8e58a5ffd37e890e0acae3 (patch) | |
tree | f700af54ef3679d888485306243ab6e3f0d115b2 /Lib/idlelib/PyShell.py | |
parent | efc527a0cb65ec99e94712e715ed08782ade36be (diff) | |
download | cpython-2a6f4b33271742f66a8e58a5ffd37e890e0acae3.zip cpython-2a6f4b33271742f66a8e58a5ffd37e890e0acae3.tar.gz cpython-2a6f4b33271742f66a8e58a5ffd37e890e0acae3.tar.bz2 |
Merged revisions 88003 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88003 | ned.deily | 2011-01-14 20:37:12 -0800 (Fri, 14 Jan 2011) | 5 lines
#10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5,
rather than the currently problematic Apple-supplied one,
when running with the 64-/32-bit installer variant.
........
Diffstat (limited to 'Lib/idlelib/PyShell.py')
-rw-r--r-- | Lib/idlelib/PyShell.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index acae420..0c95df4 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1432,6 +1432,13 @@ def main(): shell.interp.prepend_syspath(script) shell.interp.execfile(script) + # Check for problematic OS X Tk versions and print a warning message + # in the IDLE shell window; this is less intrusive than always opening + # a separate window. + tkversionwarning = macosxSupport.tkVersionWarning(root) + if tkversionwarning: + shell.interp.runcommand(''.join(("print('", tkversionwarning, "')"))) + root.mainloop() root.destroy() |