Skip to content

C
cpython
Kaydet (Commit) 822b87f2 authored tarafından Raymond Hettinger's avatar Raymond Hettinger
Dosyalara gözat
Seçenekler

Deprecate contextlib.nested(). The with-statement now provides this functionality directly.

üst b4d2d318
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 2 deletions
Doc/library/contextlib.rst
Dosyayı görüntüle @ 822b87f2
...@@ -83,6 +83,8 @@ Functions provided: ...@@ -83,6 +83,8 @@ Functions provided:
:meth:`__exit__` methods should avoid raising exceptions, and in particular they :meth:`__exit__` methods should avoid raising exceptions, and in particular they
should not re-raise a passed-in exception. should not re-raise a passed-in exception.
.. deprecated:: 2.7
The with-statement now supports this functionality directly.
.. function:: closing(thing) .. function:: closing(thing)
......
Lib/contextlib.py
Dosyayı görüntüle @ 822b87f2
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import sys import sys
from functools import wraps from functools import wraps
from warnings import warn
__all__ = ["contextmanager", "nested", "closing"] __all__ = ["contextmanager", "nested", "closing"]
...@@ -101,6 +102,8 @@ def nested(*managers): ...@@ -101,6 +102,8 @@ def nested(*managers):
<body> <body>
""" """
warn("With-statements now directly support multiple context managers",
DeprecationWarning, 2)
exits = [] exits = []
vars = [] vars = []
exc = (None, None, None) exc = (None, None, None)
......
Lib/test/test_contextlib.py
Dosyayı görüntüle @ 822b87f2
...@@ -9,6 +9,7 @@ import unittest ...@@ -9,6 +9,7 @@ import unittest
import threading import threading
from contextlib import * # Tests __all__ from contextlib import * # Tests __all__
from test import test_support from test import test_support
import warnings
class ContextManagerTestCase(unittest.TestCase): class ContextManagerTestCase(unittest.TestCase):
...@@ -331,7 +332,9 @@ class LockContextTestCase(unittest.TestCase): ...@@ -331,7 +332,9 @@ class LockContextTestCase(unittest.TestCase):
# This is needed to make the test actually run under regrtest.py! # This is needed to make the test actually run under regrtest.py!
def test_main(): def test_main():
test_support.run_unittest(__name__) with warnings.catch_warnings():
warnings.simplefilter('ignore')
test_support.run_unittest(__name__)
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()
Misc/NEWS
Dosyayı görüntüle @ 822b87f2
...@@ -12,7 +12,8 @@ What's New in Python 2.7 alpha 1 ...@@ -12,7 +12,8 @@ What's New in Python 2.7 alpha 1
Core and Builtins Core and Builtins
----------------- -----------------
- Added support for multiple context managers in the same with statement. - Added support for multiple context managers in the same with-statement.
Deprecated contextlib.nested() which is no longer needed.
- Issue #6101: A new opcode, SETUP_WITH, has been added to speed up the with - Issue #6101: A new opcode, SETUP_WITH, has been added to speed up the with
statement and correctly lookup the __enter__ and __exit__ special methods. statement and correctly lookup the __enter__ and __exit__ special methods.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment