summaryrefslogtreecommitdiff
path: root/Modules/_collectionsmodule.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-17 19:39:39 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-17 19:39:39 +0000
commitf72006f4429975a9d221e046e43dabd4f41eda23 (patch)
treebe6e2e820a20408fd2702e32d43b4a10f11c470b /Modules/_collectionsmodule.c
parent960c2113282927f7d1018f822be2cd7e0e82cdd3 (diff)
downloadcpython-git-f72006f4429975a9d221e046e43dabd4f41eda23.tar.gz
Merged revisions 84146-84147,84150 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84146 | antoine.pitrou | 2010-08-17 19:55:07 +0200 (mar., 17 août 2010) | 4 lines Issue #9612: The set object is now 64-bit clean under Windows. ........ r84147 | antoine.pitrou | 2010-08-17 20:30:06 +0200 (mar., 17 août 2010) | 3 lines Fix <deque iterator>.__length_hint__() under 64-bit Windows. ........ r84150 | antoine.pitrou | 2010-08-17 21:33:30 +0200 (mar., 17 août 2010) | 3 lines Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". ........
Diffstat (limited to 'Modules/_collectionsmodule.c')
-rw-r--r--Modules/_collectionsmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 0c77bc834a..1227de01a4 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1035,7 +1035,7 @@ dequeiter_next(dequeiterobject *it)
static PyObject *
dequeiter_len(dequeiterobject *it)
{
- return PyLong_FromLong(it->counter);
+ return PyLong_FromSsize_t(it->counter);
}
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");