[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #28616: merge from 3.5

[ned.deily]

https://hg.python.org/cpython/rev/048870daf397
changeset:   104910:048870daf397
branch:      3.6
parent:      104906:1473b9a17a91
parent:      104909:1390bde4b768
user:        Ned Deily <nad at python.org>
date:        Fri Nov 04 17:07:06 2016 -0400
summary:
  Issue #28616: merge from 3.5

files:
  Misc/ACKS          |  1 +
  Python/sysmodule.c |  2 +-
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1486,6 +1486,7 @@
 Indra Talip
 Neil Tallim
 Geoff Talvola
+Anish Tambe
 Musashi Tamura
 William Tanksley
 Christian Tanzer
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1739,7 +1739,7 @@
     {"major", "Major release number"},
     {"minor", "Minor release number"},
     {"micro", "Patch release number"},
-    {"releaselevel", "'alpha', 'beta', 'candidate', or 'release'"},
+    {"releaselevel", "'alpha', 'beta', 'candidate', or 'final'"},
     {"serial", "Serial release number"},
     {0}
 };

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