doc/man: avoid file builtin to solve build error #11984
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tchaikov
reviewed
Nov 15, 2016
| @@ -9,7 +10,7 @@ | |||
|
|
|||
|
|
|||
| def _get_description(fname, base): | |||
| with file(fname) as f: | |||
| with contextlib.closing(open(fname)) as f: | |||
There was a problem hiding this comment.
why not just put open(fname) which is acceptable in both py2 and py3.
There was a problem hiding this comment.
Yes, you're right. I was thinking of sockets which need contextlib.closing. Thanks @tchaikov!
Fixed in new commit.
Sphinx running with Python 3.X fails:
# Sphinx version: 1.4.8
# Python version: 3.5.2 (CPython)
# Docutils version: 0.12 release
# Jinja2 version: 2.8
# Last messages:
# Loaded extensions:
Traceback (most recent call last):
File "/usr/lib/python3.5/site-packages/sphinx/cmdline.py", line 243, in main
opts.warningiserror, opts.tags, opts.verbosity, opts.jobs)
File "/usr/lib/python3.5/site-packages/sphinx/application.py", line 137, in __init__
confoverrides or {}, self.tags)
File "/usr/lib/python3.5/site-packages/sphinx/config.py", line 287, in __init__
execfile_(filename, config)
File "/usr/lib/python3.5/site-packages/sphinx/util/pycompat.py", line 130, in execfile_
exec_(code, _globals)
File "conf.py", line 56, in <module>
File "conf.py", line 47, in _get_manpages
File "conf.py", line 12, in _get_description
NameError: name 'file' is not defined
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
batrick
force-pushed
the
sphinx-py3-error
branch
from
e180f28
to
425cb9f
Compare
|
lgtm, tested manually. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sphinx running with Python 3.X fails:
Signed-off-by: Patrick Donnelly pdonnell@redhat.com