Merged revisions 79030-79032 via svnmerge from

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

........
  r79030 | florent.xicluna | 2010-03-17 20:05:04 +0100 (mer, 17 mar 2010) | 2 lines

  Cleanup in test_import and test_coding.
........
  r79031 | florent.xicluna | 2010-03-17 20:15:56 +0100 (mer, 17 mar 2010) | 2 lines

  Cleanup some test cases using check_warnings and check_py3k_warnings.
........
  r79032 | florent.xicluna | 2010-03-17 21:05:11 +0100 (mer, 17 mar 2010) | 2 lines

  Fix and check cgi module deprecation warnings.  Revert an unwanted rename in test_import.
........

1 files changed, 59 insertions, 50 deletions

diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index 9922407..9b34467 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -8,9 +8,8 @@ import shutil
 import stat
 import sys
 import unittest
-import warnings
-from test.support import (unlink, TESTFN, unload, run_unittest,
-                          TestFailed, EnvironmentVarGuard, swap_attr, swap_item)
+from test.support import (unlink, TESTFN, unload, run_unittest, is_jython,
+                          check_warnings, EnvironmentVarGuard, swap_attr, swap_item)
 
 
 def remove_files(name):
@@ -19,12 +18,15 @@ def remove_files(name):
               name + ".pyo",
               name + ".pyw",
               name + "$py.class"):
-        if os.path.exists(f):
-            os.remove(f)
+        unlink(f)
 
 
 class ImportTests(unittest.TestCase):
 
+    def tearDown(self):
+        unload(TESTFN)
+    setUp = tearDown
+
     def test_case_sensitivity(self):
         # Brief digression to test that import is case-sensitive:  if we got
         # this far, we know for sure that "random" exists.
@@ -45,7 +47,7 @@ class ImportTests(unittest.TestCase):
             # The extension is normally ".py", perhaps ".pyw".
             source = TESTFN + ext
             pyo = TESTFN + ".pyo"
-            if sys.platform.startswith('java'):
+            if is_jython:
                 pyc = TESTFN + "$py.class"
             else:
                 pyc = TESTFN + ".pyc"
@@ -66,15 +68,15 @@ class ImportTests(unittest.TestCase):
                 except ImportError as err:
                     self.fail("import from %s failed: %s" % (ext, err))
 
-                self.assertEquals(mod.a, a,
+                self.assertEqual(mod.a, a,
                     "module loaded (%s) but contents invalid" % mod)
-                self.assertEquals(mod.b, b,
+                self.assertEqual(mod.b, b,
                     "module loaded (%s) but contents invalid" % mod)
             finally:
                 unlink(source)
                 unlink(pyc)
                 unlink(pyo)
-                del sys.modules[TESTFN]
+                unload(TESTFN)
 
         sys.path.insert(0, os.curdir)
         try:
@@ -100,21 +102,22 @@ class ImportTests(unittest.TestCase):
             fn = fname + 'c'
             if not os.path.exists(fn):
                 fn = fname + 'o'
-                if not os.path.exists(fn): raise TestFailed("__import__ did "
-                    "not result in creation of either a .pyc or .pyo file")
+                if not os.path.exists(fn):
+                    self.fail("__import__ did not result in creation of "
+                              "either a .pyc or .pyo file")
             s = os.stat(fn)
-            self.assertEquals(stat.S_IMODE(s.st_mode),
-                              stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
+            self.assertEqual(stat.S_IMODE(s.st_mode),
+                             stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
         finally:
             os.umask(oldmask)
             remove_files(TESTFN)
-            if TESTFN in sys.modules: del sys.modules[TESTFN]
+            unload(TESTFN)
             del sys.path[0]
 
     def test_imp_module(self):
         # Verify that the imp module can correctly load and find .py files
         import imp, os
-        # XXX (ncoghlan): It would be nice to use test_support.CleanImport
+        # XXX (ncoghlan): It would be nice to use support.CleanImport
         # here, but that breaks because the os module registers some
         # handlers in copy_reg on import. Since CleanImport doesn't
         # revert that registration, the module is left in a broken
@@ -144,7 +147,7 @@ class ImportTests(unittest.TestCase):
         # Compile & remove .py file, we only need .pyc (or .pyo).
         with open(filename, 'r') as f:
             py_compile.compile(filename)
-        os.unlink(filename)
+        unlink(filename)
 
         # Need to be able to load from current dir.
         sys.path.append('')
@@ -154,10 +157,8 @@ class ImportTests(unittest.TestCase):
 
         # Cleanup.
         del sys.path[-1]
-        for ext in '.pyc', '.pyo':
-            fname = module + ext
-            if os.path.exists(fname):
-                os.unlink(fname)
+        unlink(filename + 'c')
+        unlink(filename + 'o')
 
     def test_failing_import_sticks(self):
         source = TESTFN + ".py"
@@ -171,15 +172,11 @@ class ImportTests(unittest.TestCase):
             del sys.modules[TESTFN]
         try:
             for i in [1, 2, 3]:
-                try:
-                    mod = __import__(TESTFN)
-                except ZeroDivisionError:
-                    if TESTFN in sys.modules:
-                        self.fail("damaged module in sys.modules on %i. try" % i)
-                else:
-                    self.fail("was able to import a damaged module on %i. try" % i)
+                self.assertRaises(ZeroDivisionError, __import__, TESTFN)
+                self.assertNotIn(TESTFN, sys.modules,
+                                 "damaged module in sys.modules on %i try" % i)
         finally:
-            sys.path.pop(0)
+            del sys.path[0]
             remove_files(TESTFN)
 
     def test_import_name_binding(self):
@@ -210,8 +207,8 @@ class ImportTests(unittest.TestCase):
         try:
             mod = __import__(TESTFN)
             self.assertIn(TESTFN, sys.modules)
-            self.assertEquals(mod.a, 1, "module has wrong attribute values")
-            self.assertEquals(mod.b, 2, "module has wrong attribute values")
+            self.assertEqual(mod.a, 1, "module has wrong attribute values")
+            self.assertEqual(mod.b, 2, "module has wrong attribute values")
 
             # On WinXP, just replacing the .py file wasn't enough to
             # convince reload() to reparse it.  Maybe the timestamp didn't
@@ -226,18 +223,17 @@ class ImportTests(unittest.TestCase):
             self.assertRaises(ZeroDivisionError, imp.reload, mod)
             # But we still expect the module to be in sys.modules.
             mod = sys.modules.get(TESTFN)
-            self.assertFalse(mod is None, "expected module to be in sys.modules")
+            self.assertIsNot(mod, None, "expected module to be in sys.modules")
 
             # We should have replaced a w/ 10, but the old b value should
             # stick.
-            self.assertEquals(mod.a, 10, "module has wrong attribute values")
-            self.assertEquals(mod.b, 2, "module has wrong attribute values")
+            self.assertEqual(mod.a, 10, "module has wrong attribute values")
+            self.assertEqual(mod.b, 2, "module has wrong attribute values")
 
         finally:
-            sys.path.pop(0)
+            del sys.path[0]
             remove_files(TESTFN)
-            if TESTFN in sys.modules:
-                del sys.modules[TESTFN]
+            unload(TESTFN)
 
     def test_file_to_source(self):
         # check if __file__ points to the source file where available
@@ -255,19 +251,34 @@ class ImportTests(unittest.TestCase):
             ext = mod.__file__[-4:]
             self.assertIn(ext, ('.pyc', '.pyo'))
         finally:
-            sys.path.pop(0)
+            del sys.path[0]
             remove_files(TESTFN)
             if TESTFN in sys.modules:
                 del sys.modules[TESTFN]
 
+    def test_import_name_binding(self):
+        # import x.y.z binds x in the current namespace.
+        import test as x
+        import test.support
+        self.assertIs(x, test, x.__name__)
+        self.assertTrue(hasattr(test.support, "__file__"))
+
+        # import x.y.z as w binds z as w.
+        import test.support as y
+        self.assertIs(y, test.support, y.__name__)
+
+    def test_import_initless_directory_warning(self):
+        with check_warnings(('', ImportWarning)):
+            # Just a random non-package directory we always expect to be
+            # somewhere in sys.path...
+            self.assertRaises(ImportError, __import__, "site-packages")
+
     def test_import_by_filename(self):
         path = os.path.abspath(TESTFN)
-        try:
+        with self.assertRaises(ImportError) as c:
             __import__(path)
-        except ImportError as err:
-            pass
-        else:
-            self.fail("import by path didn't raise an exception")
+        self.assertEqual("Import by filename is not supported.",
+                         c.exception.args[0])
 
 
 class PycRewritingTests(unittest.TestCase):
@@ -302,10 +313,9 @@ func_filename = func.__code__.co_filename
         if self.orig_module is not None:
             sys.modules[self.module_name] = self.orig_module
         else:
-            del sys.modules[self.module_name]
-        for file_name in self.file_name, self.compiled_name:
-            if os.path.exists(file_name):
-                os.remove(file_name)
+            unload(self.module_name)
+        unlink(self.file_name)
+        unlink(self.compiled_name)
         if os.path.exists(self.dir_name):
             shutil.rmtree(self.dir_name)
 
@@ -406,11 +416,10 @@ class PathsTests(unittest.TestCase):
 
 
 class RelativeImportTests(unittest.TestCase):
+
     def tearDown(self):
-        try:
-            del sys.modules["test.relimport"]
-        except:
-            pass
+        unload("test.relimport")
+    setUp = tearDown
 
     def test_relimport_star(self):
         # This will import * from .test_import.