summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-18 11:55:15 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-18 11:55:15 (GMT)
commit058258652a180b8685056511e5d7baffa40d4b01 (patch)
treef937486409b370daf08834194fdb8027d48f3511
parent1e2b6882fc28a3cded227f55e4dc3f937afd678e (diff)
parent4a0d1e7c36f8ce2720fa6121b61bd048a87714ed (diff)
downloadcpython-058258652a180b8685056511e5d7baffa40d4b01.zip
cpython-058258652a180b8685056511e5d7baffa40d4b01.tar.gz
cpython-058258652a180b8685056511e5d7baffa40d4b01.tar.bz2
Merge 3.5 (pytime, odict)
-rw-r--r--Objects/odictobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
index 104d6c1..7df419e 100644
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -998,7 +998,7 @@ odict_reduce(register PyODictObject *od)
goto Done;
else {
PyObject *empty, *od_vars, *iterator, *key;
- int ns_len;
+ Py_ssize_t ns_len;
/* od.__dict__ isn't necessarily a dict... */
ns = PyObject_CallMethod((PyObject *)vars, "copy", NULL);