summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-11-04 21:07:06 (GMT)
committerNed Deily <nad@python.org>2016-11-04 21:07:06 (GMT)
commit7d76c906f7c5ab3b1c887e0c64a4478ffd4c0843 (patch)
treea1e31aac1508a5e88bf54c12a0ebea7b37bc0bf4
parent69312fa4a2712b3ff37e473c833a42162aa9b5cd (diff)
parentda4887a88d4400ef12aca0bb8269838d2c9f9a00 (diff)
downloadcpython-7d76c906f7c5ab3b1c887e0c64a4478ffd4c0843.zip
cpython-7d76c906f7c5ab3b1c887e0c64a4478ffd4c0843.tar.gz
cpython-7d76c906f7c5ab3b1c887e0c64a4478ffd4c0843.tar.bz2
Issue #28616: merge from 3.5
-rw-r--r--Misc/ACKS1
-rw-r--r--Python/sysmodule.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 6b02ef7..508f0c5 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1486,6 +1486,7 @@ Takase Arihiro
Indra Talip
Neil Tallim
Geoff Talvola
+Anish Tambe
Musashi Tamura
William Tanksley
Christian Tanzer
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 5dd0d10..e348b38 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1739,7 +1739,7 @@ static PyStructSequence_Field version_info_fields[] = {
{"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}
};