Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use io.open in notebookapp.py to fix #4303 #4348

Closed
wants to merge 3 commits into from
Closed

Use io.open in notebookapp.py to fix #4303 #4348

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8d7d40
Use io.open in notebookapp.py to fix #4303
slel Jan 16, 2019
780ef87
Another open -> io.open change
slel Jan 16, 2019
0579bc0
Specify utf-8 encoding in io.open()
slel Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions notebook/notebookapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ def server_info(self):
def write_server_info_file(self):
"""Write the result of server_info() to the JSON file info_file."""
try:
with open(self.info_file, 'w') as f:
with io.open(self.info_file, 'w', encoding='utf-8') as f:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I think I told you to change the wrong one. This one needs to stay as regular open(), because the JSON module on Python 2 produces bytes, not unicode.

I thought we were looking at this line, but it already uses io.open():

notebook/notebook/notebookapp.py

Line 1699 in 0579bc0

with io.open(self.browser_open_file, 'w', encoding='utf-8') as f:

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If commit f8d7d40 has all that is needed, can you use only that commit
and leave out the further two commits in this branch when you merge?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. I'll open a new PR so it re-runs the CI tests with just that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #4349

json.dump(self.server_info(), f, indent=2, sort_keys=True)
except OSError as e:
self.log.error(_("Failed to write server-info to %s: %s"),
Expand Down Expand Up @@ -1739,7 +1739,7 @@ def launch_browser(self):

# Write a temporary file to open in the browser
fd, open_file = tempfile.mkstemp(suffix='.html')
with open(fd, 'w', encoding='utf-8') as fh:
with io.open(fd, 'w', encoding='utf-8') as fh:
self._write_browser_open_file(uri, fh)
else:
open_file = self.browser_open_file
Expand Down