summaryrefslogtreecommitdiff
path: root/Doc/reference/datamodel.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-11-22 03:18:24 +0000
committerÉric Araujo <merwok@netwok.org>2010-11-22 03:18:24 +0000
commitda825ab2ddf7d8c7a4c6672c75a2ea907af8dfe9 (patch)
treec404bcf71592add5ce026f2267607ca24446b00c /Doc/reference/datamodel.rst
parentf213d2317cc167263bb8599e599bddc5537fed1a (diff)
downloadcpython-git-da825ab2ddf7d8c7a4c6672c75a2ea907af8dfe9.tar.gz
Merged revisions 86670 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86670 | eric.araujo | 2010-11-22 04:09:19 +0100 (lun., 22 nov. 2010) | 5 lines Remove unnecessary `object` base class in docs (#10366). Also add a note about inheritance from `object` being default. ........
Diffstat (limited to 'Doc/reference/datamodel.rst')
-rw-r--r--Doc/reference/datamodel.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 9643f2b79e..b33c1a1ff7 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1988,7 +1988,7 @@ to work correctly if defined on an object's type, not in the object's instance
dictionary. That behaviour is the reason why the following code raises an
exception::
- >>> class C(object):
+ >>> class C:
... pass
...
>>> c = C()