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

[benjamin.peterson]

http://hg.python.org/cpython/rev/49ae53150ee0
changeset:   88461:49ae53150ee0
parent:      88458:37ed85008f51
parent:      88459:d46bf7835b45
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jan 13 23:56:30 2014 -0500
summary:
  merge 3.3 (#20250)

files:
  Modules/_collectionsmodule.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1699,11 +1699,13 @@
 }
 
 PyDoc_STRVAR(defdict_doc,
-"defaultdict(default_factory) --> dict with default factory\n\
+"defaultdict(default_factory[, ...]) --> dict with default factory\n\
 \n\
 The default factory is called without arguments to produce\n\
 a new value when a key is not present, in __getitem__ only.\n\
 A defaultdict compares equal to a dict with the same items.\n\
+All remaining arguments are treated the same as if they were\n\
+passed to the dict constructor, including keyword arguments.\n\
 ");
 
 /* See comment in xxsubtype.c */

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