Merge branch 'master' of https://github.com/uqfoundation/dill into ne…

…w_file_handling Conflicts: tests/test_file.py
uqfoundation · Aug 21, 2014 · 11bd4b3 · 11bd4b3
2 parents b435bb7 + 5ff7e22
commit 11bd4b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/dill/dill.py b/dill/dill.py
@@ -131,7 +131,8 @@ def ndarrayinstance(obj): return False
     ExitType = None     # IPython.core.autocall.ExitAutocall
     singletontypes = ['exit', 'quit', 'get_ipython']
 except NameError:
-    ExitType = type(exit)
+    try: ExitType = type(exit) # apparently 'exit' can be removed
+    except NameError: ExitType = None
     singletontypes = []
 
 ### File modes

diff --git a/tests/test_file.py b/tests/test_file.py
@@ -293,6 +293,7 @@ def test(safe_file, file_mode):
         f2tell = f2.tell()
         f2.write(" world!")
         f2.close()
+
         if file_mode == dill.FMODE_PRESERVEDATA:
             assert open(fname).read() == " world!"
             assert f2mode == 'w+'
@@ -330,6 +331,7 @@ def test(safe_file, file_mode):
         f2.write(" world!")
         f2.close()
         assert f2mode == fmode
+
         if file_mode == dill.FMODE_PRESERVEDATA:
             assert open(fname).read() == " world!"
             assert f2tell == 0