summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-29 10:16:28 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2017-01-29 10:16:28 (GMT)
commit3a6dc19f6ea42a43e64b9c0b75d8a7792c16330a (patch)
tree831e466394db50a9493b8239f5af1a9e501e2979
parentaf4e5d9dedea792d10d5678601c294351e6973e8 (diff)
parente61592e7e1dd56bf88c9153465157e501bf48c50 (diff)
downloadcpython-3a6dc19f6ea42a43e64b9c0b75d8a7792c16330a.zip
cpython-3a6dc19f6ea42a43e64b9c0b75d8a7792c16330a.tar.gz
cpython-3a6dc19f6ea42a43e64b9c0b75d8a7792c16330a.tar.bz2
Issues #29349: Merge Py 2 fix 3.6
-rw-r--r--Doc/tools/extensions/patchlevel.py4
-rw-r--r--Misc/NEWS5
2 files changed, 7 insertions, 2 deletions
diff --git a/Doc/tools/extensions/patchlevel.py b/Doc/tools/extensions/patchlevel.py
index bca2eb8..9558b9c 100644
--- a/Doc/tools/extensions/patchlevel.py
+++ b/Doc/tools/extensions/patchlevel.py
@@ -61,8 +61,8 @@ def get_version_info():
return get_header_version_info('.')
except (IOError, OSError):
version, release = get_sys_version_info()
- print >>sys.stderr, 'Can\'t get version info from Include/patchlevel.h, ' \
- 'using version of this interpreter (%s).' % release
+ print('Can\'t get version info from Include/patchlevel.h, ' \
+ 'using version of this interpreter (%s).' % release, file=sys.stderr)
return version, release
if __name__ == '__main__':
diff --git a/Misc/NEWS b/Misc/NEWS
index 137de9d..add8d74 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -847,6 +847,11 @@ Windows
- Issue #28896: Deprecate WindowsRegistryFinder and disable it by default.
+Documentation
+-------------
+
+- Issue #29349: Fix Python 2 syntax in code for building the documentation.
+
Tests
-----