From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 11 Jun 2016 06:06:40 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a2~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5c43f4c01c48fe12e46d2d4236403174913e406;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

b5c43f4c01c48fe12e46d2d4236403174913e406
diff --cc Lib/idlelib/PyShell.py
index 38c12cd8bfc0,5dec68e58088..0f7a01d77ba2
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@@ -1551,9 -1557,17 +1564,9 @@@ def main()
          root.wm_iconphoto(True, *icons)
  
      fixwordbreaks(root)
-     root.withdraw()
+     fix_x11_paste(root)
      flist = PyShellFileList(root)
 -    macosxSupport.setupApp(root, flist)
 -
 -    if macosxSupport.isAquaTk():
 -        # There are some screwed up <2> class bindings for text
 -        # widgets defined in Tk which we need to do away with.
 -        # See issue #24801.
 -        root.unbind_class('Text', '<B2>')
 -        root.unbind_class('Text', '<B2-Motion>')
 -        root.unbind_class('Text', '<<PasteSelection>>')
 +    macosx.setupApp(root, flist)
  
      if enable_edit:
          if not (cmd or script):