##// END OF EJS Templates
Merge pull request #2432 from bfroehle/revert_1831...
Merge pull request #2432 from bfroehle/revert_1831 Revert #1831, the `__file__` injection in safe_execfile / safe_execfile_ipy. This reverts commit 2717feb, reversing changes made to ea4f608. Pull request #1831 (fix #1814 set __file__ when running .ipy files) has been the source of a lot of grief: #2279: Setting __file__ to None breaks Mayavi import #2429: Using warnings.warn() results in TypeError In general the patch was inappropriate because it: 1. Fails to properly restore the context, by setting __file__ to None rather than deleting it. 2. Sets __file__ in the wrong dictionary (self.user_ns rather than where[0]).

File last commit:

r7874:4a6836ce
r8509:d3d37a3a merge
Show More
test_json.py
14 lines | 219 B | text/x-python | PythonLexer
Brian E. Granger
Initial draft of more formal notebook format....
r4401 from unittest import TestCase
Brian E. Granger
Full versioning added to nbformat.
r4406 from ..nbjson import reads, writes
from .nbexamples import nb0
Brian E. Granger
Initial draft of more formal notebook format....
r4401
class TestJSON(TestCase):
def test_roundtrip(self):
s = writes(nb0)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(reads(s),nb0)
Brian E. Granger
Initial draft of more formal notebook format....
r4401