Issue #28616: merge from 3.5

This commit is contained in:
Ned Deily 2016-11-04 17:07:06 -04:00
commit 7d76c906f7
2 changed files with 2 additions and 1 deletions

View File

@ -1486,6 +1486,7 @@ Takase Arihiro
Indra Talip
Neil Tallim
Geoff Talvola
Anish Tambe
Musashi Tamura
William Tanksley
Christian Tanzer

View File

@ -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}
};