From b50dc432148bb2dd610a3d902f08252dd7cfb65b 2014-04-22 11:51:03
From: zah <zaharid@gmail.com>
Date: 2014-04-22 11:51:03
Subject: [PATCH] try..finally for tearing down test

---

diff --git a/IPython/utils/tests/test_traitlets.py b/IPython/utils/tests/test_traitlets.py
index 6ec3255..cc1360b 100644
--- a/IPython/utils/tests/test_traitlets.py
+++ b/IPython/utils/tests/test_traitlets.py
@@ -678,16 +678,18 @@ class TraitTestBase(TestCase):
         None in self._bad_values):
             trait=self.obj.traits()['value']
             if isinstance(trait, AllowNone) and not trait._allow_none:
-                trait._allow_none = True
-                self._bad_values.remove(None)
-                #skip coerce. Allow None casts None to None.
-                self.assign(None)
-                self.assertEqual(self.obj.value,None)
-                self.test_good_values()
-                self.test_bad_values()
-                #tear down
-                trait._allow_none = False
-                self._bad_values.append(None)
+                try:
+                    trait._allow_none = True
+                    self._bad_values.remove(None)
+                    #skip coerce. Allow None casts None to None.
+                    self.assign(None)
+                    self.assertEqual(self.obj.value,None)
+                    self.test_good_values()
+                    self.test_bad_values()
+                finally:
+                    #tear down
+                    trait._allow_none = False
+                    self._bad_values.append(None)
 
 
     def tearDown(self):
@@ -1122,4 +1124,4 @@ def test_pickle_hastraits():
         c2 = pickle.loads(p)
         nt.assert_equal(c2.i, c.i)
         nt.assert_equal(c2.j, c.j)
-    
\ No newline at end of file
+