#10768: fix ScrolledText widget construction, and make the example work from the...

diff --git a/Lib/tkinter/scrolledtext.py b/Lib/tkinter/scrolledtext.py
index 8173f5e747cd66f92b3707a4196dd2a92c13d01c..9aa936ae94922c8dab3739bd8a210fdd0dc1c4f1 100644 (file)
--- a/Lib/tkinter/scrolledtext.py
+++ b/Lib/tkinter/scrolledtext.py
@@ -30,8 +30,8 @@ class ScrolledText(Text):
         # Copy geometry methods of self.frame without overriding Text
         # methods -- hack!
         text_meths = vars(Text).keys()
-        methods = vars(Pack).keys() + vars(Grid).keys() + vars(Place).keys()
-        methods = set(methods).difference(text_meths)
+        methods = vars(Pack).keys() | vars(Grid).keys() | vars(Place).keys()
+        methods = methods.difference(text_meths)
 
         for m in methods:
             if m[0] != '_' and m != 'config' and m != 'configure':
@@ -42,11 +42,10 @@ class ScrolledText(Text):
 
 
 def example():
-    import __main__
     from tkinter.constants import END
 
     stext = ScrolledText(bg='white', height=10)
-    stext.insert(END, __main__.__doc__)
+    stext.insert(END, __doc__)
     stext.pack(fill=BOTH, side=LEFT, expand=True)
     stext.focus_set()
     stext.mainloop()

diff --git a/Misc/NEWS b/Misc/NEWS
index 46b6233627920f6e167ef22c1d244d3c24cf0d93..38709afeeec26abade680d9e004966d635c8e793 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #10768: Make the Tkinter ScrolledText widget work again.
+
 - Issue #10777: Fix "dictionary changed size during iteration" bug in
   ElementTree register_namespace().