[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

Sun Sep 27 02:04:49 CEST 2015

https://hg.python.org/cpython/rev/e732c42abedf
changeset: 98292:e732c42abedf
parent: 98288:d5739600368f
parent: 98291:fd9009f313b9
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Sep 26 20:04:23 2015 -0400
summary:
 Merge with 3.5
files:
 Lib/idlelib/AutoCompleteWindow.py | 1 +
 Lib/idlelib/CallTipWindow.py | 1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Lib/idlelib/AutoCompleteWindow.py b/Lib/idlelib/AutoCompleteWindow.py
--- a/Lib/idlelib/AutoCompleteWindow.py
+++ b/Lib/idlelib/AutoCompleteWindow.py
@@ -192,6 +192,7 @@
 scrollbar.config(command=listbox.yview)
 scrollbar.pack(side=RIGHT, fill=Y)
 listbox.pack(side=LEFT, fill=BOTH, expand=True)
+ acw.lift() # work around bug in Tk 8.5.18+ (issue #24570)
 
 # Initialize the listbox selection
 self.listbox.select_set(self._binary_search(self.start))
diff --git a/Lib/idlelib/CallTipWindow.py b/Lib/idlelib/CallTipWindow.py
--- a/Lib/idlelib/CallTipWindow.py
+++ b/Lib/idlelib/CallTipWindow.py
@@ -72,6 +72,7 @@
 background="#ffffe0", relief=SOLID, borderwidth=1,
 font = self.widget['font'])
 self.label.pack()
+ tw.lift() # work around bug in Tk 8.5.18+ (issue #24570)
 
 self.checkhideid = self.widget.bind(CHECKHIDE_VIRTUAL_EVENT_NAME,
 self.checkhide_event)
-- 
Repository URL: https://hg.python.org/cpython
