From: Nick Coghlan <ncoghlan@gmail.com>
Date: Thu, 5 May 2011 13:58:57 +0000 (+1000)
Subject: Merge #11647 update from 3.2
X-Git-Tag: v3.3.0a1~2400
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ceb1804b0359bfe73aca19ff75cb51eb7dcabd4;p=python

Merge #11647 update from 3.2
---

7ceb1804b0359bfe73aca19ff75cb51eb7dcabd4
diff --cc Misc/NEWS
index 5fa8e70c86,5fb153d5ec..8cfce02108
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,9 -83,10 +140,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11647: objects created using contextlib.contextmanager now support
+   more than one call to the function when used as a decorator. Initial patch
+   by Ysj Ray.
+ 
 +- Issue #11930: Removed deprecated time.accept2dyear variable.
 +  Removed year >= 1000 restriction from datetime.strftime.
 +
  - logging: don't define QueueListener if Python has no thread support.
  
  - functools.cmp_to_key() now works with collections.Hashable().