[Python-checkins] r82851 - in python/branches/release31-maint: Lib/test/support.py

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Tue Jul 13 16:55:04 2010
New Revision: 82851

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/support.py

Modified: python/branches/release31-maint/Lib/test/support.py
==============================================================================
--- python/branches/release31-maint/Lib/test/support.py	(original)
+++ python/branches/release31-maint/Lib/test/support.py	Tue Jul 13 16:55:04 2010
@@ -98,7 +98,7 @@
         orig_modules[name] = sys.modules[name]
     except KeyError:
         saved = False
-    sys.modules[name] = 0
+    sys.modules[name] = None
     return saved