From 4a5ac611ded0aae76a16f44e9ae146d52d9f9dc2 2012-01-30 19:50:04
From: Brian Granger <ellisonbg@gmail.com>
Date: 2012-01-30 19:50:04
Subject: [PATCH] Removing old xml notebook format.

---

diff --git a/IPython/nbformat/current.py b/IPython/nbformat/current.py
index ab4fa3b..37f2ba1 100644
--- a/IPython/nbformat/current.py
+++ b/IPython/nbformat/current.py
@@ -48,17 +48,6 @@ def parse_json(s, **kwargs):
     return nbformat, d
 
 
-def parse_xml(s, **kwargs):
-    """Parse a string into a (nbformat, etree) tuple."""
-    root = ET.fromstring(s)
-    nbformat_e = root.find('nbformat')
-    if nbformat_e is not None:
-        nbformat = int(nbformat_e.text)
-    else:
-        raise NBFormatError('No nbformat version found')
-    return nbformat, root
-
-
 def parse_py(s, **kwargs):
     """Parse a string into a (nbformat, string) tuple."""
     pattern = r'# <nbformat>(?P<nbformat>\d+)</nbformat>'
@@ -87,16 +76,6 @@ def writes_json(nb, **kwargs):
     return v2.writes_json(nb, **kwargs)
 
 
-def reads_xml(s, **kwargs):
-    """Read an XML notebook from a string and return the NotebookNode object."""
-    nbformat, root = parse_xml(s, **kwargs)
-    if nbformat == 2:
-        nb = v2.to_notebook_xml(root, **kwargs)
-    else:
-        raise NBFormatError('Unsupported XML nbformat version: %i' % nbformat)
-    return nb
-
-
 def reads_py(s, **kwargs):
     """Read a .py notebook from a string and return the NotebookNode object."""
     nbformat, s = parse_py(s, **kwargs)
@@ -133,9 +112,7 @@ def reads(s, format, **kwargs):
         The notebook that was read.
     """
     format = unicode(format)
-    if format == u'xml':
-        return reads_xml(s, **kwargs)
-    elif format == u'json' or format == u'ipynb':
+    if format == u'json' or format == u'ipynb':
         return reads_json(s, **kwargs)
     elif format == u'py':
         return reads_py(s, **kwargs)
@@ -161,9 +138,7 @@ def writes(nb, format, **kwargs):
         The notebook string.
     """
     format = unicode(format)
-    if format == u'xml':
-        raise NotImplementedError('Write to XML files is not implemented.')
-    elif format == u'json' or format == u'ipynb':
+    if format == u'json' or format == u'ipynb':
         return writes_json(nb, **kwargs)
     elif format == u'py':
         return writes_py(nb, **kwargs)
diff --git a/IPython/nbformat/v2/__init__.py b/IPython/nbformat/v2/__init__.py
index 8e41b05..55c13ef 100644
--- a/IPython/nbformat/v2/__init__.py
+++ b/IPython/nbformat/v2/__init__.py
@@ -26,10 +26,6 @@ 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
 
-from .nbxml import reads as reads_xml
-from .nbxml import reads as read_xml
-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