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

[steve.dower]

https://hg.python.org/cpython/rev/1af036b2dc01
changeset:   104391:1af036b2dc01
parent:      104389:d76c8f9ea787
parent:      104390:701e52103528
user:        Steve Dower <steve.dower at microsoft.com>
date:        Sat Oct 08 12:24:37 2016 -0700
summary:
  Merge with 3.6

files:
  Misc/NEWS |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -222,7 +222,8 @@
 Windows
 -------
 
-- Issue #28333: Enables Unicode for ps1/ps2 and input() prompts
+- Issue #28333: Enables Unicode for ps1/ps2 and input() prompts. (Patch by
+  Eryk Sun)
 
 - Issue #28251: Improvements to help manuals on Windows.
 

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