From 4b57968bf29b442d81d4b45d237c80bd0ac9ac41 Mon Sep 17 00:00:00 2001
From: mmckerns <mmckerns@8bfda07e-5b16-0410-ab1d-fd04ec2748df>
Date: Wed, 20 Aug 2014 19:27:47 +0000
Subject: [PATCH] fix: if 'exit' not defined; make test_file 2.5 compatable

git-svn-id: svn+ssh://svn.mystic.cacr.caltech.edu/pathos/dill@700 8bfda07e-5b16-0410-ab1d-fd04ec2748df
---
 dill/dill.py       |  3 ++-
 tests/test_file.py | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dill/dill.py b/dill/dill.py
index c158702b..9600ad81 100644
--- a/dill/dill.py
+++ b/dill/dill.py
@@ -130,7 +130,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 = []
 
 ### Shorthands (modified from python2.5/lib/pickle.py)
diff --git a/tests/test_file.py b/tests/test_file.py
index 829e9a2f..8571db4e 100644
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -15,11 +15,13 @@
 
 
 def write_randomness(number=200):
-    with open(fname, "w") as f:
-        for i in range(number):
-            f.write(random.choice(rand_chars))
-    with open(fname, "r") as f:
-        contents = f.read()
+    f = open(fname, "w")
+    for i in range(number):
+        f.write(random.choice(rand_chars))
+    f.close()
+    f = open(fname, "r")
+    contents = f.read()
+    f.close()
     return contents
 
 
@@ -335,7 +337,7 @@ def test(safefmode=False, kwargs={}):
         assert f2tell == ftell
         # 3) prefer data over filehandle state
         # assert open(fname).read() == "\x00\x00\x00\x00\x00 world!"
-        # assert f2mode == 'r+'  #FIXME: spec'd as 'r+' but is 'w+'
+        # assert f2mode == 'w+'
         # assert f2tell == ftell
         # 2) treat as if new filehandle, will truncate file
         # assert open(fname).read() == " world!"
@@ -377,7 +379,7 @@ def test(safefmode=False, kwargs={}):
         f2.close()
         assert f2mode == fmode
         # 1) preserve mode and position  #XXX: also 3)
-        assert open(fname).read() == " world!" # 3) FIXME: throws, should not?
+        assert open(fname).read() == " world!"
         assert f2tell == ftell
         # 2) treat as if new filehandle, will seek(EOF)
         # assert open(fname).read() == " world!"