##// END OF EJS Templates
Merge pull request #1490 from minrk/raw...
Merge pull request #1490 from minrk/raw rename plaintext cell -> raw cell Raw cells should be *untransformed* when writing various output formats, as the point of them is to let users pass through IPython to their rendered document format (rst, latex, etc.). This is different from what is the logical meaning of 'plaintext', which would suggest that the contents should be preserved as unformatted plaintext (e.g. in a `<pre>` tag, or literal block). In the UI, these cells will be displayed as 'Raw Text'. WARNING: any existing v3 notebooks which use plaintext cells, when read in by versions after this merge, will silently rename those cells to 'raw'. But if such a notebook is uploaded into a pre-merge IPython, cells labeled as 'raw' will simply *not be displayed*.

File last commit:

r6476:ef2fac7e
r6480:a0e0f391 merge
Show More
test_nbpy.py
46 lines | 1.4 KiB | text/x-python | PythonLexer
MinRK
add NBFormatTestCase base class, to consolidate nbformat testing
r6209 # -*- coding: utf8 -*-
MinRK
NBFormatTest is now a mixin, rather than a base class
r6476
from unittest import TestCase
MinRK
add NBFormatTestCase base class, to consolidate nbformat testing
r6209 from . import formattest
Brian E. Granger
Initial draft of more formal notebook format....
r4401
MinRK
add NBFormatTestCase base class, to consolidate nbformat testing
r6209 from .. import nbpy
Brian E. Granger
Full versioning added to nbformat.
r4406 from .nbexamples import nb0, nb0_py
Brian E. Granger
Initial draft of more formal notebook format....
r4401
MinRK
NBFormatTest is now a mixin, rather than a base class
r6476 class TestPy(formattest.NBFormatTest, TestCase):
Brian E. Granger
Initial draft of more formal notebook format....
r4401
MinRK
add NBFormatTestCase base class, to consolidate nbformat testing
r6209 nb0_ref = nb0_py
ext = 'py'
mod = nbpy
ignored_keys = ['collapsed', 'outputs', 'prompt_number', 'metadata']
Brian E. Granger
Initial draft of more formal notebook format....
r4401
MinRK
add NBFormatTestCase base class, to consolidate nbformat testing
r6209 def assertSubset(self, da, db):
"""assert that da is a subset of db, ignoring self.ignored_keys.
Called recursively on containers, ultimately comparing individual
elements.
"""
if isinstance(da, dict):
for k,v in da.iteritems():
if k in self.ignored_keys:
continue
self.assertTrue(k in db)
self.assertSubset(v, db[k])
elif isinstance(da, list):
for a,b in zip(da, db):
self.assertSubset(a,b)
else:
MinRK
preserve trailing newlines in ipynb...
r6318 if isinstance(da, basestring) and isinstance(db, basestring):
# pyfile is not sensitive to preserving leading/trailing
# newlines in blocks through roundtrip
da = da.strip('\n')
db = db.strip('\n')
MinRK
add NBFormatTestCase base class, to consolidate nbformat testing
r6209 self.assertEquals(da, db)
return True
def assertNBEquals(self, nba, nbb):
# since roundtrip is lossy, only compare keys that are preserved
# assumes nba is read from my file format
return self.assertSubset(nba, nbb)