[Python-checkins] r79037 - in python/branches/py3k-jit: Lib/test/regrtest.py Lib/test/support.py Lib/test/test_dynamic.py Lib/test/test_import.py

Wed Mar 17 22:47:38 CET 2010

Author: collin.winter
Date: Wed Mar 17 22:47:38 2010
New Revision: 79037
Log:
Merged revisions 79009,79014,79017,79019-79020,79022,79025 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r79009 | collin.winter | 2010年03月16日 17:41:56 -0700 (2010年3月16日) | 1 line
 
 Add some tests for ways users can change or shadow globals and builtins.
................
 r79014 | collin.winter | 2010年03月16日 19:08:57 -0700 (2010年3月16日) | 9 lines
 
 Merged revisions 79013 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r79013 | collin.winter | 2010年03月16日 19:02:30 -0700 (2010年3月16日) | 1 line
 
 Fix a trivial class of (hypothetical, future) false-positive refleaks, discovered by an optimization in Unladen Swallow's past (which will become CPython's future).
 ........
................
 r79017 | collin.winter | 2010年03月16日 19:51:00 -0700 (2010年3月16日) | 1 line
 
 Commit missing merge info from r79014.
................
 r79019 | collin.winter | 2010年03月16日 20:09:21 -0700 (2010年3月16日) | 9 lines
 
 Merged revisions 79016 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r79016 | collin.winter | 2010年03月16日 19:40:12 -0700 (2010年3月16日) | 1 line
 
 Style cleanup in test_import.
 ........
................
 r79020 | collin.winter | 2010年03月16日 20:14:31 -0700 (2010年3月16日) | 1 line
 
 Add tests for overriding and shadowing __import__; these are a useful tripwire for an incoming JIT optimization.
................
 r79022 | benjamin.peterson | 2010年03月16日 20:30:15 -0700 (2010年3月16日) | 1 line
 
 set svn:eol-style
................
 r79025 | ezio.melotti | 2010年03月17日 07:28:47 -0700 (2010年3月17日) | 8 lines
 
 Blocked revisions 79023 via svnmerge
 
 ........
 r79023 | ezio.melotti | 2010年03月17日 15:52:48 +0200 (2010年3月17日) | 1 line
 
 #7092: silence some more py3k warnings.
 ........
................
Added:
 python/branches/py3k-jit/Lib/test/test_dynamic.py
 - copied unchanged from r79025, /python/branches/py3k/Lib/test/test_dynamic.py
Modified:
 python/branches/py3k-jit/ (props changed)
 python/branches/py3k-jit/Lib/test/regrtest.py
 python/branches/py3k-jit/Lib/test/support.py
 python/branches/py3k-jit/Lib/test/test_import.py
Modified: python/branches/py3k-jit/Lib/test/regrtest.py
==============================================================================

--- python/branches/py3k-jit/Lib/test/regrtest.py	(original)
+++ python/branches/py3k-jit/Lib/test/regrtest.py	Wed Mar 17 22:47:38 2010
@@ -1010,13 +1010,14 @@
 sys.stderr.flush()
 dash_R_cleanup(fs, ps, pic, zdc, abcs)
 for i in range(repcount):
- rc = sys.gettotalrefcount()
+ rc_before = sys.gettotalrefcount()
 run_the_test()
 sys.stderr.write('.')
 sys.stderr.flush()
 dash_R_cleanup(fs, ps, pic, zdc, abcs)
+ rc_after = sys.gettotalrefcount()
 if i >= nwarmup:
- deltas.append(sys.gettotalrefcount() - rc - 2)
+ deltas.append(rc_after - rc_before)
 print(file=sys.stderr)
 if any(deltas):
 msg = '%s leaked %s references, sum=%s' % (test, deltas, sum(deltas))
Modified: python/branches/py3k-jit/Lib/test/support.py
==============================================================================
--- python/branches/py3k-jit/Lib/test/support.py	(original)
+++ python/branches/py3k-jit/Lib/test/support.py	Wed Mar 17 22:47:38 2010
@@ -30,7 +30,8 @@
 "run_with_locale",
 "set_memlimit", "bigmemtest", "bigaddrspacetest", "BasicTestRunner",
 "run_unittest", "run_doctest", "threading_setup", "threading_cleanup",
- "reap_children", "cpython_only", "check_impl_detail", "get_attribute"]
+ "reap_children", "cpython_only", "check_impl_detail", "get_attribute",
+ "swap_item", "swap_attr"]
 
 class Error(Exception):
 """Base class for regression test exceptions."""
@@ -1074,3 +1075,57 @@
 break
 except:
 break
+
+ at contextlib.contextmanager
+def swap_attr(obj, attr, new_val):
+ """Temporary swap out an attribute with a new object.
+
+ Usage:
+ with swap_attr(obj, "attr", 5):
+ ...
+
+ This will set obj.attr to 5 for the duration of the with: block,
+ restoring the old value at the end of the block. If `attr` doesn't
+ exist on `obj`, it will be created and then deleted at the end of the
+ block.
+ """
+ if hasattr(obj, attr):
+ real_val = getattr(obj, attr)
+ setattr(obj, attr, new_val)
+ try:
+ yield
+ finally:
+ setattr(obj, attr, real_val)
+ else:
+ setattr(obj, attr, new_val)
+ try:
+ yield
+ finally:
+ delattr(obj, attr)
+
+ at contextlib.contextmanager
+def swap_item(obj, item, new_val):
+ """Temporary swap out an item with a new object.
+
+ Usage:
+ with swap_item(obj, "item", 5):
+ ...
+
+ This will set obj["item"] to 5 for the duration of the with: block,
+ restoring the old value at the end of the block. If `item` doesn't
+ exist on `obj`, it will be created and then deleted at the end of the
+ block.
+ """
+ if item in obj:
+ real_val = obj[item]
+ obj[item] = new_val
+ try:
+ yield
+ finally:
+ obj[item] = real_val
+ else:
+ obj[item] = new_val
+ try:
+ yield
+ finally:
+ del obj[item]
Modified: python/branches/py3k-jit/Lib/test/test_import.py
==============================================================================
--- python/branches/py3k-jit/Lib/test/test_import.py	(original)
+++ python/branches/py3k-jit/Lib/test/test_import.py	Wed Mar 17 22:47:38 2010
@@ -1,15 +1,16 @@
-import unittest
+import builtins
+import imp
+import marshal
 import os
-import stat
+import py_compile
 import random
 import shutil
+import stat
 import sys
-import py_compile
+import unittest
 import warnings
-import imp
-import marshal
 from test.support import (unlink, TESTFN, unload, run_unittest,
- TestFailed, EnvironmentVarGuard)
+ TestFailed, EnvironmentVarGuard, swap_attr, swap_item)
 
 
 def remove_files(name):
@@ -22,11 +23,11 @@
 os.remove(f)
 
 
-class ImportTest(unittest.TestCase):
+class ImportTests(unittest.TestCase):
 
- def testCaseSensitivity(self):
- # Brief digression to test that import is case-sensitive: if we got this
- # far, we know for sure that "random" exists.
+ 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.
 try:
 import RAnDoM
 except ImportError:
@@ -34,13 +35,14 @@
 else:
 self.fail("import of RAnDoM should have failed (case mismatch)")
 
- def testDoubleConst(self):
- # Another brief digression to test the accuracy of manifest float constants.
+ def test_double_const(self):
+ # Another brief digression to test the accuracy of manifest float
+ # constants.
 from test import double_const # don't blink -- that *was* the test
 
- def testImport(self):
+ def test_import(self):
 def test_with_extension(ext):
- # ext normally ".py"; perhaps ".pyw"
+ # The extension is normally ".py", perhaps ".pyw".
 source = TESTFN + ext
 pyo = TESTFN + ".pyo"
 if sys.platform.startswith('java'):
@@ -49,7 +51,8 @@
 pyc = TESTFN + ".pyc"
 
 with open(source, "w") as f:
- print("# This tests Python's ability to import a", ext, "file.", file=f)
+ print("# This tests Python's ability to import a", ext, "file.",
+ file=f)
 a = random.randrange(1000)
 b = random.randrange(1000)
 print("a =", a, file=f)
@@ -77,7 +80,7 @@
 try:
 test_with_extension(".py")
 if sys.platform.startswith("win"):
- for ext in ".PY", ".Py", ".pY", ".pyw", ".PYW", ".pYw":
+ for ext in [".PY", ".Py", ".pY", ".pyw", ".PYW", ".pYw"]:
 test_with_extension(ext)
 finally:
 del sys.path[0]
@@ -108,7 +111,7 @@
 if TESTFN in sys.modules: del sys.modules[TESTFN]
 del sys.path[0]
 
- def testImpModule(self):
+ 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
@@ -128,30 +131,28 @@
 self.assertIsNot(orig_getenv, new_os.getenv)
 
 def test_module_with_large_stack(self, module='longlist'):
- # create module w/list of 65000 elements to test bug #561858
+ # Regression test for http://bugs.python.org/issue561858.
 filename = module + '.py'
 
- # create a file with a list of 65000 elements
- f = open(filename, 'w+')
- f.write('d = [\n')
- for i in range(65000):
- f.write('"",\n')
- f.write(']')
- f.close()
-
- # compile & remove .py file, we only need .pyc (or .pyo)
- f = open(filename, 'r')
- py_compile.compile(filename)
- f.close()
+ # Create a file with a list of 65000 elements.
+ with open(filename, 'w+') as f:
+ f.write('d = [\n')
+ for i in range(65000):
+ f.write('"",\n')
+ f.write(']')
+
+ # Compile & remove .py file, we only need .pyc (or .pyo).
+ with open(filename, 'r') as f:
+ py_compile.compile(filename)
 os.unlink(filename)
 
- # need to be able to load from current dir
+ # Need to be able to load from current dir.
 sys.path.append('')
 
- # this used to crash
+ # This used to crash.
 exec('import ' + module)
 
- # cleanup
+ # Cleanup.
 del sys.path[-1]
 for ext in '.pyc', '.pyo':
 fname = module + ext
@@ -160,9 +161,8 @@
 
 def test_failing_import_sticks(self):
 source = TESTFN + ".py"
- f = open(source, "w")
- print("a = 1/0", file=f)
- f.close()
+ with open(source, "w") as f:
+ print("a = 1/0", file=f)
 
 # New in 2.4, we shouldn't be able to import that no matter how often
 # we try.
@@ -170,7 +170,7 @@
 if TESTFN in sys.modules:
 del sys.modules[TESTFN]
 try:
- for i in 1, 2, 3:
+ for i in [1, 2, 3]:
 try:
 mod = __import__(TESTFN)
 except ZeroDivisionError:
@@ -202,7 +202,7 @@
 
 def test_failing_reload(self):
 # A failing reload should leave the module object in sys.modules.
- source = TESTFN + ".py"
+ source = TESTFN + os.extsep + "py"
 with open(source, "w") as f:
 f.write("a = 1\nb=2\n")
 
@@ -226,7 +226,7 @@
 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 still be in sys.modules")
+ self.assertFalse(mod is None, "expected module to be in sys.modules")
 
 # We should have replaced a w/ 10, but the old b value should
 # stick.
@@ -260,8 +260,7 @@
 if TESTFN in sys.modules:
 del sys.modules[TESTFN]
 
-
- def test_importbyfilename(self):
+ def test_import_by_filename(self):
 path = os.path.abspath(TESTFN)
 try:
 __import__(path)
@@ -271,7 +270,7 @@
 self.fail("import by path didn't raise an exception")
 
 
-class TestPycRewriting(unittest.TestCase):
+class PycRewritingTests(unittest.TestCase):
 # Test that the `co_filename` attribute on code objects always points
 # to the right file, even when various things happen (e.g. both the .py
 # and the .pyc file are renamed).
@@ -363,6 +362,7 @@
 mod = self.import_module()
 self.assertEqual(mod.constant.co_filename, foreign_code.co_filename)
 
+
 class PathsTests(unittest.TestCase):
 SAMPLES = ('test', 'test\u00e4\u00f6\u00fc\u00df', 'test\u00e9\u00e8',
 'test\u00b0\u00b3\u00b2')
@@ -376,22 +376,20 @@
 shutil.rmtree(self.path)
 sys.path[:] = self.syspath
 
- # http://bugs.python.org/issue1293
+ # Regression test for http://bugs.python.org/issue1293.
 def test_trailing_slash(self):
- f = open(os.path.join(self.path, 'test_trailing_slash.py'), 'w')
- f.write("testdata = 'test_trailing_slash'")
- f.close()
+ with open(os.path.join(self.path, 'test_trailing_slash.py'), 'w') as f:
+ f.write("testdata = 'test_trailing_slash'")
 sys.path.append(self.path+'/')
 mod = __import__("test_trailing_slash")
 self.assertEqual(mod.testdata, 'test_trailing_slash')
 unload("test_trailing_slash")
 
- # http://bugs.python.org/issue3677
+ # Regression test for http://bugs.python.org/issue3677.
 def _test_UNC_path(self):
- f = open(os.path.join(self.path, 'test_trailing_slash.py'), 'w')
- f.write("testdata = 'test_trailing_slash'")
- f.close()
- #create the UNC path, like \\myhost\c$\foo\bar
+ with open(os.path.join(self.path, 'test_trailing_slash.py'), 'w') as f:
+ f.write("testdata = 'test_trailing_slash'")
+ # Create the UNC path, like \\myhost\c$\foo\bar.
 path = os.path.abspath(self.path)
 import socket
 hn = socket.gethostname()
@@ -407,7 +405,7 @@
 test_UNC_path = _test_UNC_path
 
 
-class RelativeImport(unittest.TestCase):
+class RelativeImportTests(unittest.TestCase):
 def tearDown(self):
 try:
 del sys.modules["test.relimport"]
@@ -417,34 +415,63 @@
 def test_relimport_star(self):
 # This will import * from .test_import.
 from . import relimport
- self.assertTrue(hasattr(relimport, "RelativeImport"))
+ self.assertTrue(hasattr(relimport, "RelativeImportTests"))
 
 def test_issue3221(self):
 # Note for mergers: the 'absolute' tests from the 2.x branch
 # are missing in Py3k because implicit relative imports are
 # a thing of the past
+ #
+ # Regression test for http://bugs.python.org/issue3221.
 def check_relative():
 exec("from . import relimport", ns)
+
 # Check relative import OK with __package__ and __name__ correct
 ns = dict(__package__='test', __name__='test.notarealmodule')
 check_relative()
+
 # Check relative import OK with only __name__ wrong
 ns = dict(__package__='test', __name__='notarealpkg.notarealmodule')
 check_relative()
+
 # Check relative import fails with only __package__ wrong
 ns = dict(__package__='foo', __name__='test.notarealmodule')
 self.assertRaises(SystemError, check_relative)
+
 # Check relative import fails with __package__ and __name__ wrong
 ns = dict(__package__='foo', __name__='notarealpkg.notarealmodule')
 self.assertRaises(SystemError, check_relative)
+
 # Check relative import fails with package set to a non-string
 ns = dict(__package__=object())
 self.assertRaises(ValueError, check_relative)
 
+
+class OverridingImportBuiltinTests(unittest.TestCase):
+ def test_override_builtin(self):
+ # Test that overriding builtins.__import__ can bypass sys.modules.
+ import os
+
+ def foo():
+ import os
+ return os
+ self.assertEqual(foo(), os) # Quick sanity check.
+
+ with swap_attr(builtins, "__import__", lambda *x: 5):
+ self.assertEqual(foo(), 5)
+
+ # Test what happens when we shadow __import__ in globals(); this
+ # currently does not impact the import process, but if this changes,
+ # other code will need to change, so keep this test as a tripwire.
+ with swap_item(globals(), "__import__", lambda *x: 5):
+ self.assertEqual(foo(), os)
+
+
 def test_main(verbose=None):
- run_unittest(ImportTest, TestPycRewriting, PathsTests, RelativeImport)
+ run_unittest(ImportTests, PycRewritingTests, PathsTests, RelativeImportTests,
+ OverridingImportBuiltinTests)
 
 if __name__ == '__main__':
- # test needs to be a package, so we can do relative import
+ # Test needs to be a package, so we can do relative imports.
 from test.test_import import test_main
 test_main()
