commit bed7d04fedd800a8d3bd8a7c9c3ff823e365c236
author Benjamin Peterson <benjamin@python.org> Sun Jul 19 21:01:52 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Sun Jul 19 21:01:52 2009 +0000
tree f7e20f085f4c4a6a4cc0227ab16aa73d1dd7dc8e
parent c4296d1edc1f05f96cc7b6b3e1c3df9dd596d5f4

Merged revisions 74095 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74095 | benjamin.peterson | 2009-07-19 15:18:21 -0500 (Sun, 19 Jul 2009) | 1 line

  split unittest.py into a package
........

Lib/test/test_unittest.py

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 991740c..10932de 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -6,6 +6,7 @@
     TestCase.{assert,fail}* methods (some are tested implicitly)
 """
 
+import builtins
 import os
 import re
 import sys
@@ -3389,9 +3390,10 @@
     def test_get_module_from_path(self):
         loader = unittest.TestLoader()
 
+        old_import = __import__
         def restore_import():
-            unittest.__import__ = __import__
-        unittest.__import__ = lambda *_: None
+            builtins.__import__ = old_import
+        builtins.__import__ = lambda *_: None
         self.addCleanup(restore_import)
 
         expected_module = object()