a much cleaner fix from Antoine

benjaminp · benjaminp · commit fbf66bd61705 · 2008-07-29T15:55:50.000Z
diff --git a/Lib/doctest.py b/Lib/doctest.py
@@ -1360,10 +1360,8 @@ def run(self, test, compileflags=None, out=None, clear_globs=True):
             linecache.getlines = self.save_linecache_getlines
             if clear_globs:
                 test.globs.clear()
-                if __name__ == "__main__":
-                    __builtins__._ = None
-                else:
-                    __builtins__['_'] = None
+                import builtins
+                builtins._ = None
 
     #/////////////////////////////////////////////////////////////////
     # Summarization
