##// END OF EJS Templates
fix a NameError inside an exception
fix a NameError inside an exception

File last commit:

r13353:0ca701d5
r14175:c03e6aa1
Show More
nbbase.py
180 lines | 5.6 KiB | text/x-python | PythonLexer
Brian E. Granger
More review changes....
r4609 """The basic dict based notebook format.
Bernardo B. Marques
remove all trailling spaces
r4872 The Python representation of a notebook is a nested structure of
Brian E. Granger
More review changes....
r4609 dictionary subclasses that support attribute access
(IPython.utils.ipstruct.Struct). The functions in this module are merely
helpers to build the structs in the right form.
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
Adding nbformat subpackage.
r4392
Brian E. Granger
Initial draft of more formal notebook format....
r4401 import pprint
Brian E. Granger
Adding nbformat subpackage.
r4392 import uuid
Brian E. Granger
Initial draft of more formal notebook format....
r4401 from IPython.utils.ipstruct import Struct
Thomas Kluyver
Replace references to unicode and basestring
r13353 from IPython.utils.py3compat import unicode_type
Brian E. Granger
Initial draft of more formal notebook format....
r4401
Brian E. Granger
More review changes....
r4609 #-----------------------------------------------------------------------------
# Code
#-----------------------------------------------------------------------------
Brian E. Granger
Initial draft of more formal notebook format....
r4401
class NotebookNode(Struct):
pass
Brian E. Granger
Adding nbformat subpackage.
r4392
Brian E. Granger
Full versioning added to nbformat.
r4406 def from_dict(d):
if isinstance(d, dict):
newd = NotebookNode()
for k,v in d.items():
newd[k] = from_dict(v)
return newd
elif isinstance(d, (tuple, list)):
return [from_dict(i) for i in d]
else:
return d
Brian E. Granger
Updates to basic notebook format....
r4402 def new_output(output_type=None, output_text=None, output_png=None,
Bernardo B. Marques
remove all trailling spaces
r4872 output_html=None, output_svg=None, output_latex=None, output_json=None,
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 output_javascript=None, output_jpeg=None, prompt_number=None,
etype=None, evalue=None, traceback=None):
Brian E. Granger
Adding nbformat subpackage.
r4392 """Create a new code cell with input and output"""
Brian E. Granger
Initial draft of more formal notebook format....
r4401 output = NotebookNode()
Brian E. Granger
Updates to basic notebook format....
r4402 if output_type is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.output_type = unicode_type(output_type)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540
if output_type != 'pyerr':
if output_text is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.text = unicode_type(output_text)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if output_png is not None:
output.png = bytes(output_png)
if output_jpeg is not None:
output.jpeg = bytes(output_jpeg)
if output_html is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.html = unicode_type(output_html)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if output_svg is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.svg = unicode_type(output_svg)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if output_latex is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.latex = unicode_type(output_latex)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if output_json is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.json = unicode_type(output_json)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if output_javascript is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.javascript = unicode_type(output_javascript)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540
if output_type == u'pyout':
if prompt_number is not None:
output.prompt_number = int(prompt_number)
if output_type == u'pyerr':
if etype is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.etype = unicode_type(etype)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if evalue is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.evalue = unicode_type(evalue)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if traceback is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 output.traceback = [unicode_type(frame) for frame in list(traceback)]
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540
Brian E. Granger
Updates to basic notebook format....
r4402 return output
Brian E. Granger
Adding nbformat subpackage.
r4392
Brian E. Granger
Added collapsed field to the code cell.
r4533 def new_code_cell(input=None, prompt_number=None, outputs=None,
language=u'python', collapsed=False):
Brian E. Granger
Updates to basic notebook format....
r4402 """Create a new code cell with input and output"""
cell = NotebookNode()
cell.cell_type = u'code'
if language is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 cell.language = unicode_type(language)
Brian E. Granger
Updates to basic notebook format....
r4402 if input is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 cell.input = unicode_type(input)
Brian E. Granger
Updates to basic notebook format....
r4402 if prompt_number is not None:
cell.prompt_number = int(prompt_number)
if outputs is None:
cell.outputs = []
else:
cell.outputs = outputs
Brian E. Granger
Added collapsed field to the code cell.
r4533 if collapsed is not None:
Brian E. Granger
New .py notebook format implemented.
r4536 cell.collapsed = bool(collapsed)
Brian E. Granger
Updates to basic notebook format....
r4402
return cell
Brian E. Granger
Markdown cells are now saved and restored in notebooks.
r4511 def new_text_cell(cell_type, source=None, rendered=None):
Brian E. Granger
Adding nbformat subpackage.
r4392 """Create a new text cell."""
Brian E. Granger
Initial draft of more formal notebook format....
r4401 cell = NotebookNode()
Brian E. Granger
Starting to rename text cell to html cell.
r4498 if source is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 cell.source = unicode_type(source)
Brian E. Granger
Markdown cells are now saved and restored in notebooks.
r4511 if rendered is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 cell.rendered = unicode_type(rendered)
Brian E. Granger
Markdown cells are now saved and restored in notebooks.
r4511 cell.cell_type = cell_type
Brian E. Granger
Adding nbformat subpackage.
r4392 return cell
def new_worksheet(name=None, cells=None):
"""Create a worksheet by name with with a list of cells."""
Brian E. Granger
Initial draft of more formal notebook format....
r4401 ws = NotebookNode()
Brian E. Granger
Adding nbformat subpackage.
r4392 if name is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 ws.name = unicode_type(name)
Brian E. Granger
Adding nbformat subpackage.
r4392 if cells is None:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 ws.cells = []
Brian E. Granger
Adding nbformat subpackage.
r4392 else:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 ws.cells = list(cells)
Brian E. Granger
Adding nbformat subpackage.
r4392 return ws
Brian E. Granger
Implemented metadata for notebook format.
r4637 def new_notebook(metadata=None, worksheets=None):
Brian E. Granger
Adding nbformat subpackage.
r4392 """Create a notebook by name, id and a list of worksheets."""
Brian E. Granger
Initial draft of more formal notebook format....
r4401 nb = NotebookNode()
Brian E. Granger
Full versioning added to nbformat.
r4406 nb.nbformat = 2
Brian E. Granger
Adding nbformat subpackage.
r4392 if worksheets is None:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 nb.worksheets = []
Brian E. Granger
Adding nbformat subpackage.
r4392 else:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 nb.worksheets = list(worksheets)
Brian E. Granger
Implemented metadata for notebook format.
r4637 if metadata is None:
nb.metadata = new_metadata()
else:
nb.metadata = NotebookNode(metadata)
return nb
def new_metadata(name=None, authors=None, license=None, created=None,
modified=None, gistid=None):
"""Create a new metadata node."""
metadata = NotebookNode()
if name is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 metadata.name = unicode_type(name)
Brian E. Granger
Implemented metadata for notebook format.
r4637 if authors is not None:
metadata.authors = list(authors)
Brian E. Granger
New .py notebook format implemented.
r4536 if created is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 metadata.created = unicode_type(created)
Brian E. Granger
Implemented metadata for notebook format.
r4637 if modified is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 metadata.modified = unicode_type(modified)
Brian E. Granger
New .py notebook format implemented.
r4536 if license is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 metadata.license = unicode_type(license)
Brian E. Granger
Implemented metadata for notebook format.
r4637 if gistid is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 metadata.gistid = unicode_type(gistid)
Brian E. Granger
Implemented metadata for notebook format.
r4637 return metadata
def new_author(name=None, email=None, affiliation=None, url=None):
"""Create a new author."""
author = NotebookNode()
if name is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 author.name = unicode_type(name)
Brian E. Granger
Implemented metadata for notebook format.
r4637 if email is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 author.email = unicode_type(email)
Brian E. Granger
Implemented metadata for notebook format.
r4637 if affiliation is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 author.affiliation = unicode_type(affiliation)
Brian E. Granger
Implemented metadata for notebook format.
r4637 if url is not None:
Thomas Kluyver
Replace references to unicode and basestring
r13353 author.url = unicode_type(url)
Brian E. Granger
Implemented metadata for notebook format.
r4637 return author
Brian E. Granger
Adding nbformat subpackage.
r4392