Merged revisions 71799 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71799 | nick.coghlan | 2009-04-23 01:26:04 +1000 (Thu, 23 Apr 2009) | 1 line

  Issue 5354: Change API for import_fresh_module() to better support test_warnings use case (also fixes some bugs in the original implementation)
........
This commit is contained in:
Nick Coghlan 2009-04-22 16:13:36 +00:00
parent ae9b6ad91e
commit 4738470402
5 changed files with 93 additions and 32 deletions

View file

@ -10,14 +10,8 @@ from test import warning_tests
import warnings as original_warnings
py_warnings = support.import_fresh_module('warnings', ['_warnings'])
# XXX (ncoghlan 20090412):
# Something in Py3k doesn't like sharing the same instance of
# _warnings between original_warnings and c_warnings
# Will leave issue 5354 open until I understand why 3.x breaks
# without the next line, while 2.x doesn't care
del sys.modules['_warnings']
c_warnings = support.import_fresh_module('warnings')
py_warnings = support.import_fresh_module('warnings', blocked=['_warnings'])
c_warnings = support.import_fresh_module('warnings', fresh=['_warnings'])
@contextmanager
def warnings_state(module):