Fix error message when failing to load a notebook #6303
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
opening unreadable notebook format failed with 'NameError: NBFormatError' instead of the expected error.
|
LGTM |
|
@takluyver have you reviewed this? |
| @@ -2288,7 +2288,11 @@ define([ | |||
| this.events.trigger('notebook_load_failed.Notebook', [xhr, status, error]); | |||
| var msg; | |||
| if (xhr.status === 400) { | |||
| msg = error; | |||
| if (xhr.responseJSON && xhr.responseJSON.message) { | |||
There was a problem hiding this comment.
I see this same logic here and above in utils.js. Do we want a function in utils.js that takes an xhr and returns a properly selected error message?
There was a problem hiding this comment.
Added utils.ajax_error_msg(jqXHR) and used it in both places.
|
I left one comment. Didn't test though. |
if there is one (escaped for safety).
|
This looks good, I would say you can merge unless @takluyver wants to comment. |
takluyver
added a commit
that referenced
this pull request
Aug 14, 2014
Fix error message when failing to load a notebook
Merged
minrk
added a commit
that referenced
this pull request
Sep 11, 2014
- fix missing import in nbformat.reader.reads - show JSON error message if there is one Before, opening a v4 notebook would show: ...
mattvonrocketstein
pushed a commit
to mattvonrocketstein/ipython
that referenced
this pull request
Nov 3, 2014
Fix error message when failing to load a notebook
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.
Before, opening a v4 notebook would show:
After, it shows the intended:
Should be backported to 2.x