From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Tue, 13 Jul 2010 14:55:04 +0000 (+0000)
Subject: Merged revisions 82850 via svnmerge from
X-Git-Tag: v3.1.3rc1~512
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a5d9a29bbc2dbbab5a408ba5f592ea47894a5b2;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 82850 via svnmerge from
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.
........
---

diff --git a/Lib/test/support.py b/Lib/test/support.py
index e3a3b383337e..1eb84ebc14be 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -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