[Python-checkins] cpython (merge 3.6 -> default): Issues #29349: Merge Py 2 fix 3.6

[martin.panter]

https://hg.python.org/cpython/rev/db8b917bbfdd
changeset:   106334:db8b917bbfdd
parent:      106333:9dbb7bbc1449
parent:      106332:cdcb33f37bf3
user:        Martin Panter <vadmium+py at gmail.com>
date:        Sun Jan 29 10:16:28 2017 +0000
summary:
  Issues #29349: Merge Py 2 fix 3.6

files:
  Doc/tools/extensions/patchlevel.py |  4 ++--
  Misc/NEWS                          |  5 +++++
  2 files changed, 7 insertions(+), 2 deletions(-)


diff --git a/Doc/tools/extensions/patchlevel.py b/Doc/tools/extensions/patchlevel.py
--- a/Doc/tools/extensions/patchlevel.py
+++ b/Doc/tools/extensions/patchlevel.py
@@ -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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -847,6 +847,11 @@
 
 - Issue #28896: Deprecate WindowsRegistryFinder and disable it by default.
 
+Documentation
+-------------
+
+- Issue #29349: Fix Python 2 syntax in code for building the documentation.
+
 Tests
 -----
 

-- 
Repository URL: https://hg.python.org/cpython