##// END OF EJS Templates
Backport PR #2399: IndentationError display...
Backport PR #2399: IndentationError display IndentationError is a subclass of SyntaxError, and they should display in a similar fashion, with the problematic line and line number shown. We were being over-specific with our type checking. Closes #2398.

File last commit:

r4872:34c10438
r9827:df79d72f
Show More
__init__.py
78 lines | 2.5 KiB | text/x-python | PythonLexer
Brian E. Granger
More review changes....
r4609 """The main API for the v2 notebook format.
Authors:
* Brian Granger
"""
#-----------------------------------------------------------------------------
# Copyright (C) 2008-2011 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Brian E. Granger
Full versioning added to nbformat.
r4406
from .nbbase import (
NotebookNode,
Brian E. Granger
Implemented metadata for notebook format.
r4637 new_code_cell, new_text_cell, new_notebook, new_output, new_worksheet,
new_metadata, new_author
Brian E. Granger
Full versioning added to nbformat.
r4406 )
from .nbjson import reads as reads_json, writes as writes_json
from .nbjson import reads as read_json, writes as write_json
from .nbjson import to_notebook as to_notebook_json
Brian E. Granger
Implemented metadata for notebook format.
r4637 from .nbxml import reads as reads_xml
from .nbxml import reads as read_xml
Brian E. Granger
Full versioning added to nbformat.
r4406 from .nbxml import to_notebook as to_notebook_xml
from .nbpy import reads as reads_py, writes as writes_py
from .nbpy import reads as read_py, writes as write_py
from .nbpy import to_notebook as to_notebook_py
from .convert import convert_to_this_nbformat
Brian E. Granger
More review changes....
r4609 #-----------------------------------------------------------------------------
# Code
#-----------------------------------------------------------------------------
Brian E. Granger
Full versioning added to nbformat.
r4406
Brian E. Granger
Created new notebook magic that can export/convert notebooks....
r4520 def parse_filename(fname):
"""Parse a notebook filename.
This function takes a notebook filename and returns the notebook
Brian E. Granger
Making JSON the default .ipynb format.
r4633 format (json/py) and the notebook name. This logic can be
Brian E. Granger
Created new notebook magic that can export/convert notebooks....
r4520 summarized as follows:
Bernardo B. Marques
remove all trailling spaces
r4872 * notebook.ipynb -> (notebook.ipynb, notebook, json)
Brian E. Granger
Created new notebook magic that can export/convert notebooks....
r4520 * notebook.json -> (notebook.json, notebook, json)
* notebook.py -> (notebook.py, notebook, py)
Brian E. Granger
Making JSON the default .ipynb format.
r4633 * notebook -> (notebook.ipynb, notebook, json)
Brian E. Granger
Created new notebook magic that can export/convert notebooks....
r4520
Parameters
----------
fname : unicode
The notebook filename. The filename can use a specific filename
extention (.ipynb, .json, .py) or none, in which case .ipynb will
be assumed.
Returns
-------
Bernardo B. Marques
remove all trailling spaces
r4872 (fname, name, format) : (unicode, unicode, unicode)
The filename, notebook name and format.
Brian E. Granger
Created new notebook magic that can export/convert notebooks....
r4520 """
if fname.endswith(u'.ipynb'):
Brian E. Granger
Making JSON the default .ipynb format.
r4633 format = u'json'
Brian E. Granger
Created new notebook magic that can export/convert notebooks....
r4520 elif fname.endswith(u'.json'):
format = u'json'
elif fname.endswith(u'.py'):
format = u'py'
else:
fname = fname + u'.ipynb'
Brian E. Granger
Making JSON the default .ipynb format.
r4633 format = u'json'
Brian E. Granger
Created new notebook magic that can export/convert notebooks....
r4520 name = fname.split('.')[0]
return fname, name, format