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

[terry.reedy]

https://hg.python.org/cpython/rev/d104333e0e8d
changeset:   98114:d104333e0e8d
parent:      98110:71a6d4c7cd01
parent:      98113:0049d4e31c34
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun Sep 20 23:24:01 2015 -0400
summary:
  Merge with 3.5

files:
  Misc/NEWS |  18 ++++++++++++++++++
  1 files changed, 18 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -182,6 +182,24 @@
 - Issue #23572: Fixed functools.singledispatch on classes with falsy
   metaclasses.  Patch by Ethan Furman.
 
+IDLE
+----
+
+- Issue #25199: Idle: add synchronization comments for future maintainers.
+
+- Issue #16893: Replace help.txt with idle.html for Idle doc display.
+  The new idlelib/idle.html is copied from Doc/build/html/idle.html.
+  It looks better than help.txt and will better document Idle as released.
+  The tkinter html viewer that works for this file was written by Rose Roseman.
+  The now unused EditorWindow.HelpDialog class and helt.txt file are deprecated.
+
+- Issue #24199: Deprecate unused idlelib.idlever with possible removal in 3.6.
+
+- Issue #24782: In Idle extension config dialog, replace tabs with sorted list.
+  Patch by Mark Roseman.
+
+- Issue #24790: Remove extraneous code (which also create 2 & 3 conflicts).
+
 Documentation
 -------------
 

-- 
Repository URL: https://hg.python.org/cpython