]> granicus.if.org Git - python/commitdiff
Merged revisions 82850 via svnmerge from
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Tue, 13 Jul 2010 14:55:04 +0000 (14:55 +0000)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Tue, 13 Jul 2010 14:55:04 +0000 (14:55 +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/support.py

index e3a3b383337eccc661af07e5ec738f10e1c42fe0..1eb84ebc14be087785fb3b9533004615a91fcca2 100644 (file)
@@ -98,7 +98,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