]> granicus.if.org Git - python/commitdiff
Merged revisions 82850 via svnmerge from
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Wed, 14 Jul 2010 00:05:00 +0000 (00:05 +0000)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Wed, 14 Jul 2010 00:05:00 +0000 (00:05 +0000)
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82850 | alexander.belopolsky | 2010-07-13 10:50:16 -0400 (Tue, 13 Jul 2010) | 1 line

  Set sys.modules[name] to None instead of 0 to block module import.
........

Lib/test/test_support.py

index 6e7853b89e522c92e358c651fdbb18d7097b02a1..ce2b679ddd4aecefe5d75ed198bfc99888b89ee5 100644 (file)
@@ -105,7 +105,7 @@ def _save_and_block_module(name, orig_modules):
         orig_modules[name] = sys.modules[name]
     except KeyError:
         saved = False
-    sys.modules[name] = 0
+    sys.modules[name] = None
     return saved