From fbf66bd61705624f8c5b4b68061eeb9e5296a871 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 29 Jul 2008 15:55:50 +0000
Subject: [PATCH] a much cleaner fix from Antoine

---
 Lib/doctest.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Lib/doctest.py b/Lib/doctest.py
index e2b595ea51f..e8babd2c8f2 100644
--- 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