##// END OF EJS Templates
Fix remaining test failures....
Fix remaining test failures. This completes the decoupling of the Magic class from the main InteractiveShell one. Finally! (it's been only 10 1/2 years...) At this point, all tests pass (modulo two failures in zmq that were there before and are not related to the magics work). We can now start the rest of the work for cell level magics, including a cleaner magic management architecture and breaking them up into several classes.

File last commit:

r6061:cddb82ef
r6916:09897796
Show More
current.py
211 lines | 5.7 KiB | text/x-python | PythonLexer
Brian E. Granger
More review changes....
r4609 """The official API for working with notebooks in the current format version.
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
Implemented metadata for notebook format.
r4637 from __future__ import print_function
Brian E. Granger
Full versioning added to nbformat.
r4406 import json
from xml.etree import ElementTree as ET
import re
Brian Granger
Changing rst->plaintext in nbformat.
r6025 from IPython.nbformat import v3
Brian E. Granger
Full versioning added to nbformat.
r4406 from IPython.nbformat import v2
from IPython.nbformat import v1
Brian Granger
Changing rst->plaintext in nbformat.
r6025 from IPython.nbformat.v3 import (
Brian E. Granger
Massive work on the notebook document format....
r4484 NotebookNode,
Brian E. Granger
Created new notebook magic that can export/convert notebooks....
r4520 new_code_cell, new_text_cell, new_notebook, new_output, new_worksheet,
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 parse_filename, new_metadata, new_author, new_heading_cell, nbformat
Brian E. Granger
Massive work on the notebook document format....
r4484 )
Brian E. Granger
More review changes....
r4609 #-----------------------------------------------------------------------------
# Code
#-----------------------------------------------------------------------------
Brian E. Granger
Full versioning added to nbformat.
r4406
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 current_nbformat = nbformat
Brian E. Granger
Full versioning added to nbformat.
r4406
class NBFormatError(Exception):
pass
def parse_json(s, **kwargs):
"""Parse a string into a (nbformat, dict) tuple."""
d = json.loads(s, **kwargs)
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 nbf = d.get('nbformat',1)
return nbf, d
Brian E. Granger
Full versioning added to nbformat.
r4406
def parse_py(s, **kwargs):
"""Parse a string into a (nbformat, string) tuple."""
pattern = r'# <nbformat>(?P<nbformat>\d+)</nbformat>'
m = re.search(pattern,s)
if m is not None:
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 nbf = int(m.group('nbformat'))
Brian E. Granger
Full versioning added to nbformat.
r4406 else:
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 nbf = current_nbformat
return nbf, s
Brian E. Granger
Full versioning added to nbformat.
r4406
def reads_json(s, **kwargs):
"""Read a JSON notebook from a string and return the NotebookNode object."""
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 nbf, d = parse_json(s, **kwargs)
if nbf == 1:
Brian E. Granger
Full versioning added to nbformat.
r4406 nb = v1.to_notebook_json(d, **kwargs)
Brian Granger
Fixing minor bugs in nbformat and saving....
r6032 nb = v3.convert_to_this_nbformat(nb, orig_version=1)
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 elif nbf == 2:
Brian E. Granger
Full versioning added to nbformat.
r4406 nb = v2.to_notebook_json(d, **kwargs)
Brian Granger
Fixing minor bugs in nbformat and saving....
r6032 nb = v3.convert_to_this_nbformat(nb, orig_version=2)
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 elif nbf == 3:
Brian Granger
Fixing minor bugs in nbformat and saving....
r6032 nb = v3.to_notebook_json(d, **kwargs)
Brian E. Granger
Full versioning added to nbformat.
r4406 else:
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 raise NBFormatError('Unsupported JSON nbformat version: %i' % nbf)
Brian E. Granger
Full versioning added to nbformat.
r4406 return nb
def writes_json(nb, **kwargs):
Brian Granger
Fixing minor bugs in nbformat and saving....
r6032 return v3.writes_json(nb, **kwargs)
Brian E. Granger
Full versioning added to nbformat.
r4406
def reads_py(s, **kwargs):
"""Read a .py notebook from a string and return the NotebookNode object."""
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 nbf, s = parse_py(s, **kwargs)
if nbf == 2:
Brian E. Granger
Full versioning added to nbformat.
r4406 nb = v2.to_notebook_py(s, **kwargs)
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 elif nbf == 3:
Brian Granger
Fixing minor bugs in nbformat and saving....
r6032 nb = v3.to_notebook_py(s, **kwargs)
Brian E. Granger
Full versioning added to nbformat.
r4406 else:
Brian Granger
Proper error handling for nbformat versions in client code....
r6061 raise NBFormatError('Unsupported PY nbformat version: %i' % nbf)
Brian E. Granger
Full versioning added to nbformat.
r4406 return nb
def writes_py(nb, **kwargs):
Brian Granger
Fixing minor bugs in nbformat and saving....
r6032 return v3.writes_py(nb, **kwargs)
Brian E. Granger
Full versioning added to nbformat.
r4406
# High level API
def reads(s, format, **kwargs):
"""Read a notebook from a string and return the NotebookNode object.
This function properly handles notebooks of any version. The notebook
returned will always be in the current version's format.
Parameters
----------
Brian E. Granger
Implemented metadata for notebook format.
r4637 s : unicode
The raw unicode string to read the notebook from.
format : (u'json', u'ipynb', u'py')
Brian E. Granger
Full versioning added to nbformat.
r4406 The format that the string is in.
Returns
-------
nb : NotebookNode
The notebook that was read.
"""
Brian E. Granger
Implemented metadata for notebook format.
r4637 format = unicode(format)
Brian Granger
Removing old xml notebook format.
r6021 if format == u'json' or format == u'ipynb':
Brian E. Granger
Full versioning added to nbformat.
r4406 return reads_json(s, **kwargs)
Brian E. Granger
Implemented metadata for notebook format.
r4637 elif format == u'py':
Brian E. Granger
Full versioning added to nbformat.
r4406 return reads_py(s, **kwargs)
else:
raise NBFormatError('Unsupported format: %s' % format)
def writes(nb, format, **kwargs):
"""Write a notebook to a string in a given format in the current nbformat version.
This function always writes the notebook in the current nbformat version.
Parameters
----------
nb : NotebookNode
The notebook to write.
Brian E. Granger
Implemented metadata for notebook format.
r4637 format : (u'json', u'ipynb', u'py')
Brian E. Granger
Full versioning added to nbformat.
r4406 The format to write the notebook in.
Returns
-------
Brian E. Granger
Implemented metadata for notebook format.
r4637 s : unicode
Brian E. Granger
Full versioning added to nbformat.
r4406 The notebook string.
"""
Brian E. Granger
Implemented metadata for notebook format.
r4637 format = unicode(format)
Brian Granger
Removing old xml notebook format.
r6021 if format == u'json' or format == u'ipynb':
Brian E. Granger
Full versioning added to nbformat.
r4406 return writes_json(nb, **kwargs)
Brian E. Granger
Implemented metadata for notebook format.
r4637 elif format == u'py':
Brian E. Granger
Full versioning added to nbformat.
r4406 return writes_py(nb, **kwargs)
else:
raise NBFormatError('Unsupported format: %s' % format)
def read(fp, format, **kwargs):
"""Read a notebook from a file and return the NotebookNode object.
This function properly handles notebooks of any version. The notebook
returned will always be in the current version's format.
Parameters
----------
fp : file
Any file-like object with a read method.
Brian E. Granger
Implemented metadata for notebook format.
r4637 format : (u'json', u'ipynb', u'py')
Brian E. Granger
Full versioning added to nbformat.
r4406 The format that the string is in.
Returns
-------
nb : NotebookNode
The notebook that was read.
"""
return reads(fp.read(), format, **kwargs)
def write(nb, fp, format, **kwargs):
"""Write a notebook to a file in a given format in the current nbformat version.
This function always writes the notebook in the current nbformat version.
Parameters
----------
nb : NotebookNode
The notebook to write.
fp : file
Any file-like object with a write method.
Brian E. Granger
Implemented metadata for notebook format.
r4637 format : (u'json', u'ipynb', u'py')
Brian E. Granger
Full versioning added to nbformat.
r4406 The format to write the notebook in.
Returns
-------
Brian E. Granger
Implemented metadata for notebook format.
r4637 s : unicode
Brian E. Granger
Full versioning added to nbformat.
r4406 The notebook string.
"""
return fp.write(writes(nb, format, **kwargs))
Brian E. Granger
Implemented metadata for notebook format.
r4637 def _convert_to_metadata():
"""Convert to a notebook having notebook metadata."""
import glob
for fname in glob.glob('*.ipynb'):
print('Converting file:',fname)
with open(fname,'r') as f:
nb = read(f,u'json')
md = new_metadata()
if u'name' in nb:
md.name = nb.name
del nb[u'name']
nb.metadata = md
with open(fname,'w') as f:
write(nb, f, u'json')
Brian E. Granger
Full versioning added to nbformat.
r4406