Move the PEP 343 documentation and implementation closer to the
terminology in the alpha 1 documentation.
- "context manager" reverts to its alpha 1 definition
- the term "context specifier" goes away entirely
- contextlib.GeneratorContextManager is renamed GeneratorContext
There are still a number of changes relative to alpha 1:
- the expression in the with statement is explicitly called the
"context expression" in the language reference
- the terms 'with statement context', 'context object' or 'with
statement context' are used in several places instead of a bare
'context'. The aim of this is to avoid ambiguity in relation to the
runtime context set up when the block is executed, and the context
objects that already exist in various application domains (such as
decimal.Context)
- contextlib.contextmanager is renamed to contextfactory
This best reflects the nature of the function resulting from the
use of that decorator
- decimal.ContextManager is renamed to WithStatementContext
Simple dropping the 'Manager' part wasn't possible due to the
fact that decimal.Context already exists and means something
different. WithStatementContext is ugly but workable.
A technically unrelated change snuck into this commit:
contextlib.closing now avoids the overhead of creating a
generator, since it's trivial to implement that particular
context manager directly.
diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py
index 1a70997..53f23b2 100644
--- a/Lib/test/test_contextlib.py
+++ b/Lib/test/test_contextlib.py
@@ -13,9 +13,9 @@
class ContextManagerTestCase(unittest.TestCase):
- def test_contextmanager_plain(self):
+ def test_contextfactory_plain(self):
state = []
- @contextmanager
+ @contextfactory
def woohoo():
state.append(1)
yield 42
@@ -26,9 +26,9 @@
state.append(x)
self.assertEqual(state, [1, 42, 999])
- def test_contextmanager_finally(self):
+ def test_contextfactory_finally(self):
state = []
- @contextmanager
+ @contextfactory
def woohoo():
state.append(1)
try:
@@ -47,8 +47,8 @@
self.fail("Expected ZeroDivisionError")
self.assertEqual(state, [1, 42, 999])
- def test_contextmanager_no_reraise(self):
- @contextmanager
+ def test_contextfactory_no_reraise(self):
+ @contextfactory
def whee():
yield
ctx = whee().__context__()
@@ -56,8 +56,8 @@
# Calling __exit__ should not result in an exception
self.failIf(ctx.__exit__(TypeError, TypeError("foo"), None))
- def test_contextmanager_trap_yield_after_throw(self):
- @contextmanager
+ def test_contextfactory_trap_yield_after_throw(self):
+ @contextfactory
def whoo():
try:
yield
@@ -69,9 +69,9 @@
RuntimeError, ctx.__exit__, TypeError, TypeError("foo"), None
)
- def test_contextmanager_except(self):
+ def test_contextfactory_except(self):
state = []
- @contextmanager
+ @contextfactory
def woohoo():
state.append(1)
try:
@@ -86,14 +86,14 @@
raise ZeroDivisionError(999)
self.assertEqual(state, [1, 42, 999])
- def test_contextmanager_attribs(self):
+ def test_contextfactory_attribs(self):
def attribs(**kw):
def decorate(func):
for k,v in kw.items():
setattr(func,k,v)
return func
return decorate
- @contextmanager
+ @contextfactory
@attribs(foo='bar')
def baz(spam):
"""Whee!"""
@@ -106,13 +106,13 @@
# XXX This needs more work
def test_nested(self):
- @contextmanager
+ @contextfactory
def a():
yield 1
- @contextmanager
+ @contextfactory
def b():
yield 2
- @contextmanager
+ @contextfactory
def c():
yield 3
with nested(a(), b(), c()) as (x, y, z):
@@ -122,14 +122,14 @@
def test_nested_cleanup(self):
state = []
- @contextmanager
+ @contextfactory
def a():
state.append(1)
try:
yield 2
finally:
state.append(3)
- @contextmanager
+ @contextfactory
def b():
state.append(4)
try:
@@ -148,7 +148,7 @@
def test_nested_right_exception(self):
state = []
- @contextmanager
+ @contextfactory
def a():
yield 1
class b(object):
@@ -172,10 +172,10 @@
self.fail("Didn't raise ZeroDivisionError")
def test_nested_b_swallows(self):
- @contextmanager
+ @contextfactory
def a():
yield
- @contextmanager
+ @contextfactory
def b():
try:
yield
@@ -189,7 +189,7 @@
self.fail("Didn't swallow ZeroDivisionError")
def test_nested_break(self):
- @contextmanager
+ @contextfactory
def a():
yield
state = 0
@@ -201,7 +201,7 @@
self.assertEqual(state, 1)
def test_nested_continue(self):
- @contextmanager
+ @contextfactory
def a():
yield
state = 0
@@ -213,7 +213,7 @@
self.assertEqual(state, 3)
def test_nested_return(self):
- @contextmanager
+ @contextfactory
def a():
try:
yield