Issues #29349: Merge Py 2 fix 3.6

This commit is contained in:
Martin Panter 2017-01-29 10:16:28 +00:00
commit 3a6dc19f6e
2 changed files with 7 additions and 2 deletions

View File

@ -61,8 +61,8 @@ def get_version_info():
return get_header_version_info('.') return get_header_version_info('.')
except (IOError, OSError): except (IOError, OSError):
version, release = get_sys_version_info() version, release = get_sys_version_info()
print >>sys.stderr, 'Can\'t get version info from Include/patchlevel.h, ' \ print('Can\'t get version info from Include/patchlevel.h, ' \
'using version of this interpreter (%s).' % release 'using version of this interpreter (%s).' % release, file=sys.stderr)
return version, release return version, release
if __name__ == '__main__': if __name__ == '__main__':

View File

@ -847,6 +847,11 @@ Windows
- Issue #28896: Deprecate WindowsRegistryFinder and disable it by default. - Issue #28896: Deprecate WindowsRegistryFinder and disable it by default.
Documentation
-------------
- Issue #29349: Fix Python 2 syntax in code for building the documentation.
Tests Tests
----- -----