Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
3a6dc19f
Commit
3a6dc19f
authored
Jan 29, 2017
by
Martin Panter
Browse files
Options
Browse Files
Download
Plain Diff
Issues #29349: Merge Py 2 fix 3.6
parents
af4e5d9d
e61592e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
Doc/tools/extensions/patchlevel.py
Doc/tools/extensions/patchlevel.py
+2
-2
Misc/NEWS
Misc/NEWS
+5
-0
No files found.
Doc/tools/extensions/patchlevel.py
View file @
3a6dc19f
...
...
@@ -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__'
:
...
...
Misc/NEWS
View file @
3a6dc19f
...
...
@@ -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
-----
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment