From: Georg Brandl <georg@python.org>
Date: Wed, 18 Nov 2009 18:53:14 +0000 (+0000)
Subject: Merged revisions 76367 via svnmerge from
X-Git-Tag: v3.2a1~2161
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d131ee246be291b71950074b8f68976ad44bf4e;p=python

Merged revisions 76367 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76367 | georg.brandl | 2009-11-18 18:52:35 +0000 (Mi, 18 Nov 2009) | 1 line

  Make separate section for deprecations in 2.7 whatsnew.
........
---

diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 622da3e391..bacf729de6 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -229,8 +229,8 @@ Several performance enhancements have been added:
 
 .. ======================================================================
 
-New, Improved, and Deprecated Modules
-=====================================
+New and Improved Modules
+========================
 
 As in every release, Python's standard library received a number of
 enhancements and bug fixes.  Here's a partial list of the most notable
@@ -590,6 +590,14 @@ Martin Franklin and maintained by Kevin Walzer, was proposed for
 inclusion in :issue:`2618`, but the authors argued that Guilherme
 Polo's work was more comprehensive.
 
+
+Deprecations and Removals
+=========================
+
+* :func:`contextlib.nested`, which allows handling more than one context manager
+  with one :keyword:`with` statement, has been deprecated; :keyword:`with`
+  supports multiple context managers syntactically now.
+
 .. ======================================================================