mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Revert commit r63086.

Browse source
This commit is contained in:
Alexandre Vassalotti 2008-05-11 23:12:38 +00:00
parent f4e83dedda
commit 1fcaa77ac5
4 changed files with 219 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/test/test_py3kwarn.py
View file

@ -183,10 +183,9 @@ class TestStdlibRemovals(unittest.TestCase):
class TestStdlibRenames(unittest.TestCase):
all_platforms = {'copy_reg': 'copyreg', 'Queue': 'queue'}
inclusive_platforms = {'mac': {'PixMapWrapper': 'pixmapwrapper'}}
renames = {'copy_reg': 'copyreg', 'Queue': 'queue'}
def check_rename(self, module_name, new_module_name, optional=False):
def check_rename(self, module_name, new_module_name):
"""Make sure that:
- A DeprecationWarning is raised when importing using the
old 2.x module name.
@ -202,32 +201,23 @@ class TestStdlibRenames(unittest.TestCase):
except DeprecationWarning as exc:
self.assert_(module_name in exc.args[0])
self.assert_(new_module_name in exc.args[0])
except ImportError:
if not optional:
raise
else:
self.fail("DeprecationWarning not raised for %s" %
module_name)
with CleanImport(new_module_name):
try:
__import__(new_module_name, level=0)
except ImportError:
self.fail("cannot import %s with its 3.x name, %s" %
module_name, new_module_name)
except DeprecationWarning:
self.fail("unexpected DeprecationWarning raised for %s" %
module_name)
except ImportError:
if not optional:
self.fail("cannot import %s with its 3.x name, %s" %
module_name, new_module_name)
def test_platform_independent_renames(self):
for module_name, new_module_name in self.all_platforms.items():
def test_module_renames(self):
for module_name, new_module_name in self.renames.items():
self.check_rename(module_name, new_module_name)
def test_platform_specific_renames(self):
renames = self.inclusive_platforms.get(sys.platform, {})
for module_name, new_module_name in renames.items():
self.check_removal(module_name, new_module_name, optional=True)
def test_main():
run_unittest(TestPy3KWarnings,