[Python-checkins] cpython (merge default -> default): Merge.

Sun May 20 11:43:36 CEST 2012

http://hg.python.org/cpython/rev/6c4b39edee94
changeset: 77080:6c4b39edee94
parent: 77079:ef406c4c6463
parent: 77078:c431bac4f880
user: Charles-François Natali <neologix at free.fr>
date: Sun May 20 11:43:28 2012 +0200
summary:
 Merge.
files:
 Doc/reference/datamodel.rst | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1656,9 +1656,9 @@
 lexical scoping, while the class or instance that was used to make the
 current call is identified based on the first argument passed to the method.
 
-After the class object is created, any class decorators included in the
-function definition are invoked and the resulting object is bound in the
-local namespace to the name of the class.
+After the class object is created, it is passed to the class decorators
+included in the class definition (if any) and the resulting object is bound
+in the local namespace as the defined class.
 
 .. seealso::
 
-- 
Repository URL: http://hg.python.org/cpython
