diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-06-28 03:18:59 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-06-28 03:18:59 (GMT) |
| commit | 876b2f286b9af1a69846c84d1229014b2a885c97 (patch) | |
| tree | 1934d1ce119603a4ae7a0a37c01957a3ca2d17a2 /Lib/test | |
| parent | d2397753ee3d20579aa60b5e1c037e9e20db7ccb (diff) | |
| download | cpython-876b2f286b9af1a69846c84d1229014b2a885c97.zip cpython-876b2f286b9af1a69846c84d1229014b2a885c97.tar.gz cpython-876b2f286b9af1a69846c84d1229014b2a885c97.tar.bz2 | |
Merged revisions 72912,72920,72940 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72912 | benjamin.peterson | 2009-05-25 08:13:44 -0500 (Mon, 25 May 2009) | 5 lines
add a SETUP_WITH opcode
It speeds up the with statement and correctly looks up the special
methods involved.
........
r72920 | benjamin.peterson | 2009-05-25 15:12:57 -0500 (Mon, 25 May 2009) | 1 line
take into account the fact that SETUP_WITH pushes a finally block
........
r72940 | benjamin.peterson | 2009-05-26 07:49:59 -0500 (Tue, 26 May 2009) | 1 line
teach the peepholer about SETUP_WITH
........
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_descr.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 5c50571..ac5ab68 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -1569,6 +1569,7 @@ order (MRO) for bases """ def some_number(self_, key): self.assertEqual(key, "hi") return 4 + def swallow(*args): pass # It would be nice to have every special method tested here, but I'm # only listing the ones I can remember outside of typeobject.c, since it @@ -1584,11 +1585,8 @@ order (MRO) for bases """ set(("__class__",)), {}), ("__subclasscheck__", do_issubclass, return_true, set(("__bases__",)), {}), - # These two fail because the compiler generates LOAD_ATTR to look - # them up. We'd have to add a new opcode to fix this, and it's - # probably not worth it. - # ("__enter__", run_context, iden), - # ("__exit__", run_context, iden), + ("__enter__", run_context, iden, set(), {"__exit__" : swallow}), + ("__exit__", run_context, swallow, set(), {"__enter__" : iden}), ] class Checker(object): |