From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 29 Jul 2008 15:55:50 +0000 (+0000)
Subject: a much cleaner fix from Antoine
X-Git-Tag: v3.0b3~219
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbf66bd61705624f8c5b4b68061eeb9e5296a871;p=thirdparty%2FPython%2Fcpython.git

a much cleaner fix from Antoine
---

diff --git a/Lib/doctest.py b/Lib/doctest.py
index e2b595ea51fb..e8babd2c8f26 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -1360,10 +1360,8 @@ class DocTestRunner:
             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