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

Sun Mar 10 17:51:52 CET 2013

http://hg.python.org/cpython/rev/60cb72c7fd75
changeset: 82588:60cb72c7fd75
parent: 82585:115c43340025
parent: 82587:5eca56b68840
user: Raymond Hettinger <python at rcn.com>
date: Sun Mar 10 09:51:37 2013 -0700
summary:
 merge
files:
 Doc/howto/descriptor.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -401,7 +401,7 @@
 :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"
-- 
Repository URL: http://hg.python.org/cpython
