diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2017-02-04 09:35:10 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2017-02-04 09:35:10 +0300 |
| commit | 20d55dda2a4995d33e79acd880c5fccfa54937e4 (patch) | |
| tree | 5504aaa962c1d6d97fad4b805d0898372f68202e /Doc/tools | |
| parent | 3821030b7ba4a7ff5d34c33deff4f6886130a951 (diff) | |
| parent | b53991455f7f258ede7a26b69c2be5b8138b9f8a (diff) | |
| download | cpython-20d55dda2a4995d33e79acd880c5fccfa54937e4.tar.gz | |
Issue #29198: Merge from 3.6
Diffstat (limited to 'Doc/tools')
| -rw-r--r-- | Doc/tools/extensions/patchlevel.py | 5 | ||||
| -rw-r--r-- | Doc/tools/susp-ignored.csv | 3 | ||||
| -rw-r--r-- | Doc/tools/templates/indexsidebar.html | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Doc/tools/extensions/patchlevel.py b/Doc/tools/extensions/patchlevel.py index 919ba4a12e..617f28c252 100644 --- a/Doc/tools/extensions/patchlevel.py +++ b/Doc/tools/extensions/patchlevel.py @@ -24,15 +24,12 @@ def get_header_version_info(srcdir): rx = re.compile(r'\s*#define\s+([a-zA-Z][a-zA-Z_0-9]*)\s+([a-zA-Z_0-9]+)') d = {} - f = open(patchlevel_h) - try: + with open(patchlevel_h) as f: for line in f: m = rx.match(line) if m is not None: name, value = m.group(1, 2) d[name] = value - finally: - f.close() release = version = '%s.%s' % (d['PY_MAJOR_VERSION'], d['PY_MINOR_VERSION']) micro = int(d['PY_MICRO_VERSION']) diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv index c6e03119ae..51edb66238 100644 --- a/Doc/tools/susp-ignored.csv +++ b/Doc/tools/susp-ignored.csv @@ -324,6 +324,5 @@ whatsnew/3.5,,::,>>> addr6 = ipaddress.IPv6Address('::1') whatsnew/3.5,,:root,ERROR:root:exception whatsnew/3.5,,:exception,ERROR:root:exception whatsnew/changelog,,:version,import sys; I = version[:version.index(' ')] -whatsnew/changelog,,:gz,": TarFile opened with external fileobj and ""w:gz"" mode didn't" -whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as" whatsnew/changelog,,`,"for readability (was ""`"")." +whatsnew/changelog,,:end,str[start:end] diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html index 413c0a7699..72a4d7ae99 100644 --- a/Doc/tools/templates/indexsidebar.html +++ b/Doc/tools/templates/indexsidebar.html @@ -4,7 +4,7 @@ <ul> <li><a href="https://docs.python.org/2.7/">{% trans %}Python 2.7 (stable){% endtrans %}</a></li> <li><a href="https://docs.python.org/3.5/">{% trans %}Python 3.5 (stable){% endtrans %}</a></li> - <li><a href="https://docs.python.org/3.7/">{% trans %}Python 3.7 (in development){% endtrans %}</a></li> + <li><a href="https://docs.python.org/3.6/">{% trans %}Python 3.6 (stable){% endtrans %}</a></li> <li><a href="https://www.python.org/doc/versions/">{% trans %}Old versions{% endtrans %}</a></li> </ul> |