[Python-checkins] cpython (merge 3.6 -> default): Issue #28616: merge from 3.6
ned.deily
python-checkins at python.org
Fri Nov 4 17:08:42 EDT 2016
https://hg.python.org/cpython/rev/87d76ce01217
changeset: 104911:87d76ce01217
parent: 104907:af4ac4e4b188
parent: 104910:048870daf397
user: Ned Deily <nad at python.org>
date: Fri Nov 04 17:07:47 2016 -0400
summary:
Issue #28616: merge from 3.6
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
@@ -1488,6 +1488,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
More information about the Python-checkins
mailing list