changeset:   106332:cdcb33f37bf3
branch:      3.6
parent:      106331:9702c5f08df1
parent:      106330:ecdc864884a9
user:        Martin Panter <vadmium+py@gmail.com>
date:        Sun Jan 29 10:09:43 2017 +0000
files:       Misc/NEWS
description:
Issues #29349: Merge Py 2 fix 3.5


diff -r 9702c5f08df1 -r cdcb33f37bf3 Doc/tools/extensions/patchlevel.py
--- a/Doc/tools/extensions/patchlevel.py	Sun Jan 29 10:07:26 2017 +0000
+++ b/Doc/tools/extensions/patchlevel.py	Sun Jan 29 10:09:43 2017 +0000
@@ -61,8 +61,8 @@
         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 -r 9702c5f08df1 -r cdcb33f37bf3 Misc/NEWS
--- a/Misc/NEWS	Sun Jan 29 10:07:26 2017 +0000
+++ b/Misc/NEWS	Sun Jan 29 10:09:43 2017 +0000
@@ -157,6 +157,11 @@
   available only when Py_LIMITED_API is set to the PY_VERSION_HEX value of
   the minimum Python version supporting this API.
 
+Documentation
+-------------
+
+- Issue #29349: Fix Python 2 syntax in code for building the documentation.
+
 Tests
 -----