summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2012-05-20 09:43:28 (GMT)
committerCharles-François Natali <neologix@free.fr>2012-05-20 09:43:28 (GMT)
commit6c7bf42656fccf5c0f09de17e5912e17dce56648 (patch)
treee44a54f758252a58167ee8860a0d357688ace71a
parentb93f9fa700676841f5a0cd676b9ec1b2a7ac7e84 (diff)
parentb267475ccf558d3b7736ba9984d1cc297eb1a6ae (diff)
downloadcpython-6c7bf42656fccf5c0f09de17e5912e17dce56648.zip
cpython-6c7bf42656fccf5c0f09de17e5912e17dce56648.tar.gz
cpython-6c7bf42656fccf5c0f09de17e5912e17dce56648.tar.bz2
Merge.
-rw-r--r--Doc/reference/datamodel.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 0510d8e..643cabc 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1656,9 +1656,9 @@ created by the compiler if any methods in a class body refer to either
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::