summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-29 10:17:17 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2017-01-29 10:17:17 (GMT)
commitc654f0acf91eb38a312c12dcaf6902c14dcfc885 (patch)
tree2e8631b16fc5a292b66953a1ecb0bbe788e191ab
parent3a6dc19f6ea42a43e64b9c0b75d8a7792c16330a (diff)
downloadcpython-c654f0acf91eb38a312c12dcaf6902c14dcfc885.zip
cpython-c654f0acf91eb38a312c12dcaf6902c14dcfc885.tar.gz
cpython-c654f0acf91eb38a312c12dcaf6902c14dcfc885.tar.bz2
Issues #29349: Add NEWS for 3.7; use “with” statement
-rw-r--r--Doc/tools/extensions/patchlevel.py5
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 4 deletions
diff --git a/Doc/tools/extensions/patchlevel.py b/Doc/tools/extensions/patchlevel.py
index 9558b9c..9ba32bd 100644
--- a/Doc/tools/extensions/patchlevel.py
+++ b/Doc/tools/extensions/patchlevel.py
@@ -22,15 +22,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/Misc/NEWS b/Misc/NEWS
index add8d74..8e7b242 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -663,6 +663,8 @@ C API
Documentation
-------------
+- Issue #29349: Fix Python 2 syntax in code for building the documentation.
+
- Issue #23722: The data model reference and the porting section in the
3.6 What's New guide now cover the additional ``__classcell__`` handling
needed for custom metaclasses to fully support PEP 487 and zero-argument