Fix the tests by restoring __import__. I think the test is still valid.

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 085592add0b5209960c46e2e630184a7cfa04c4b..3f5ef8df626bb0bd0aa0f711af15d8610bfd02f6 100644 (file)
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4481,7 +4481,6 @@ def test_borrowed_ref_4_segfault():
     import types
     import __builtin__
 
-
     class X(object):
         def __getattr__(self, name):
             # this is called with name == '__bases__' by PyObject_IsInstance()
@@ -4498,9 +4497,12 @@ def test_borrowed_ref_4_segfault():
             return (self, args)
 
     # make an unbound method
-    __builtin__.__import__ = types.MethodType(Y(), None, (pseudoclass, str))
-    import spam
-
+    orig_import = __import__
+    try:
+        __builtin__.__import__ = types.MethodType(Y(), None, (pseudoclass, str))
+        import spam
+    finally:
+        __builtin__.__import__ = orig_import
 
 def test_main():
     #XXXweakref_segfault() # Must be first, somehow