From 4738470402eff47379672a45fa5eb447461b38a0 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 22 Apr 2009 16:13:36 +0000 Subject: 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) ........ --- Lib/test/test_warnings.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'Lib/test/test_warnings.py') diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py index 1f377ad7f8..4bcc210f98 100644 --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -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): -- cgit v1.2.1