[Python-Dev] undesireable unpickle behavior, proposed fix (original) (raw)

Tue Jan 27 10:49:29 CET 2009

      i = 0;
      while (PyDict_Next(state, &i, &d_key, &d_value)) {
     if (PyObject_SetItem(dict, d_key, d_value) < 0)
        goto finally;
     /* normally the keys for instance attributes are
        interned.  we should try to do that here. */
     if (PyString_CheckExact(d_key)) {
        key_str = PyString_AsString(d_key);
        name = PyString_FromString(key_str);
        if (! name)
           goto finally;
        PyString_InternInPlace(&name);
        if (PyObject_SetItem(dict, name, d_value) < 0) {
           Py_DECREF(name);
           goto finally;
        }
        Py_DECREF(name);
     } else {
        if (PyObject_SetItem(dict, d_key, d_value) < 0)
           goto finally;
     }
     }
     Py_DECREF(dict);
 }
           inst.__dict__.update(state)
           d = inst.__dict__
           try:
               for k,v in state.items():
                   d[intern(k)] = v
           # keys in state don't have to be strings
           # don't blow up, but don't go out of our way
           except TypeError:
               d.update(state)
         except RuntimeError:
             # XXX In restricted execution, the instance's __dict__
             # is not accessible.  Use the old way of unpickling