diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-03 05:37:26 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-03 05:37:26 (GMT) |
| commit | dde5b94875460e704099593766f4a5bc3279483d (patch) | |
| tree | d0c369148bd2d2f723896839aada008ef931ff19 /Lib/test/test_pkgimport.py | |
| parent | 17ae2ba78f96d661bdd1d8e2e8f96016c4aa4a60 (diff) | |
| download | cpython-dde5b94875460e704099593766f4a5bc3279483d.zip cpython-dde5b94875460e704099593766f4a5bc3279483d.tar.gz cpython-dde5b94875460e704099593766f4a5bc3279483d.tar.bz2 | |
#7092: Silence more py3k warnings. Patch by Florent Xicluna.
Diffstat (limited to 'Lib/test/test_pkgimport.py')
| -rw-r--r-- | Lib/test/test_pkgimport.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_pkgimport.py b/Lib/test/test_pkgimport.py index 8aa224a..86ea058 100644 --- a/Lib/test/test_pkgimport.py +++ b/Lib/test/test_pkgimport.py @@ -6,14 +6,14 @@ class TestImport(unittest.TestCase): def __init__(self, *args, **kw): self.package_name = 'PACKAGE_' - while sys.modules.has_key(self.package_name): + while self.package_name in sys.modules: self.package_name += random.choose(string.letters) self.module_name = self.package_name + '.foo' unittest.TestCase.__init__(self, *args, **kw) def remove_modules(self): for module_name in (self.package_name, self.module_name): - if sys.modules.has_key(module_name): + if module_name in sys.modules: del sys.modules[module_name] def setUp(self): @@ -52,8 +52,8 @@ class TestImport(unittest.TestCase): try: __import__(self.module_name) except SyntaxError: pass else: raise RuntimeError, 'Failed to induce SyntaxError' - self.assertTrue(not sys.modules.has_key(self.module_name) and - not hasattr(sys.modules[self.package_name], 'foo')) + self.assertNotIn(self.module_name, sys.modules) + self.assertFalse(hasattr(sys.modules[self.package_name], 'foo')) # ...make up a variable name that isn't bound in __builtins__ var = 'a' |
