[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (pytime, odict)

[victor.stinner]

https://hg.python.org/cpython/rev/a745a1318807
changeset:   98043:a745a1318807
parent:      98040:203134592edf
parent:      98042:e8f5502f7724
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Sep 18 13:55:15 2015 +0200
summary:
  Merge 3.5 (pytime, odict)

files:
  Objects/odictobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/odictobject.c b/Objects/odictobject.c
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -998,7 +998,7 @@
         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);

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