Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2015-09-07 01:58:29 -04:00
commit ffcff22ade
1 changed files with 1 additions and 0 deletions

View File

@ -1043,6 +1043,7 @@ class PyShell(OutputWindow):
self.write("Python %s on %s\n%s\n%s" % self.write("Python %s on %s\n%s\n%s" %
(sys.version, sys.platform, self.COPYRIGHT, nosub)) (sys.version, sys.platform, self.COPYRIGHT, nosub))
self.text.focus_force()
self.showprompt() self.showprompt()
import tkinter import tkinter
tkinter._default_root = None # 03Jan04 KBK What's this? tkinter._default_root = None # 03Jan04 KBK What's this?