summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-03-10 16:51:37 (GMT)
committerRaymond Hettinger <python@rcn.com>2013-03-10 16:51:37 (GMT)
commit6584a1e72c0aa4fa4ed7068625cfa4d3f164071a (patch)
treeea19b8772eaaad681753bc109ff24ddca9b6e14f /Doc
parente238b889eb3fb035775ef71d359058c64f4479f9 (diff)
parent686aae484175ac05c18b8840e0c26ab602a31c88 (diff)
downloadcpython-6584a1e72c0aa4fa4ed7068625cfa4d3f164071a.zip
cpython-6584a1e72c0aa4fa4ed7068625cfa4d3f164071a.tar.gz
cpython-6584a1e72c0aa4fa4ed7068625cfa4d3f164071a.tar.bz2
merge
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/descriptor.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
index 923bbe8..cc1b78d 100644
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -401,7 +401,7 @@ is to create alternate class constructors. In Python 2.3, the classmethod
:func:`dict.fromkeys` creates a new dictionary from a list of keys. The pure
Python equivalent is::
- class Dict:
+ class Dict(object):
. . .
def fromkeys(klass, iterable, value=None):
"Emulate dict_fromkeys() in Objects/dictobject.c"