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

[eli.bendersky]

http://hg.python.org/cpython/rev/558f2270cba8
changeset:   71917:558f2270cba8
parent:      71914:7bf980c490e0
parent:      71916:d062d482642c
user:        Eli Bendersky <eliben at gmail.com>
date:        Fri Aug 19 06:31:10 2011 +0300
summary:
  Merge from 3.2
Issue #12672: remove confusing part of sentence in documentation

files:
  Doc/extending/newtypes.rst |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -30,8 +30,7 @@
 just contains the refcount and a pointer to the object's "type object".  This is
 where the action is; the type object determines which (C) functions get called
 when, for instance, an attribute gets looked up on an object or it is multiplied
-by another object.  These C functions are called "type methods" to distinguish
-them from things like ``[].append`` (which we call "object methods").
+by another object.  These C functions are called "type methods".
 
 So, if you want to define a new object type, you need to create a new type
 object.

-- 
Repository URL: http://hg.python.org/cpython