diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-01-14 04:56:30 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-01-14 04:56:30 (GMT) |
| commit | e19d9d1467ef209fbcd4d9a55e4ba5e0861eff5f (patch) | |
| tree | f5477dbcf5b9bcecfa7fd388719af550c8a00e65 | |
| parent | 3993d78fbd5fbb516e36750f83c47017ba29b21f (diff) | |
| parent | 9cb33b7d0318e739024eb4adf5e7e2c26feaabaf (diff) | |
| download | cpython-e19d9d1467ef209fbcd4d9a55e4ba5e0861eff5f.zip cpython-e19d9d1467ef209fbcd4d9a55e4ba5e0861eff5f.tar.gz cpython-e19d9d1467ef209fbcd4d9a55e4ba5e0861eff5f.tar.bz2 | |
merge 3.3 (#20250)
| -rw-r--r-- | Modules/_collectionsmodule.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 310e672..c1aa9a3 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1699,11 +1699,13 @@ defdict_init(PyObject *self, PyObject *args, PyObject *kwds) } 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 */ |