[Python-checkins] r72224 - in python/branches/py3k: Lib/pickle.py Lib/test/pickletester.py Misc/NEWS Modules/_pickle.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat May  2 23:41:14 2009
New Revision: 72224

Log:
Merged revisions 72223 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72223 | antoine.pitrou | 2009-05-02 23:13:23 +0200 (sam., 02 mai 2009) | 5 lines
  
  Isue #5084: unpickling now interns the attribute names of pickled objects,
  saving memory and avoiding growth in size of subsequent pickles. Proposal
  and original patch by Jake McGuire.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/pickle.py
   python/branches/py3k/Lib/test/pickletester.py
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/_pickle.c

Modified: python/branches/py3k/Lib/pickle.py
==============================================================================
--- python/branches/py3k/Lib/pickle.py	(original)
+++ python/branches/py3k/Lib/pickle.py	Sat May  2 23:41:14 2009
@@ -1195,7 +1195,15 @@
         if isinstance(state, tuple) and len(state) == 2:
             state, slotstate = state
         if state:
-            inst.__dict__.update(state)
+            d = inst.__dict__
+            intern = sys.intern
+            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)
         if slotstate:
             for k, v in slotstate.items():
                 setattr(inst, k, v)

Modified: python/branches/py3k/Lib/test/pickletester.py
==============================================================================
--- python/branches/py3k/Lib/test/pickletester.py	(original)
+++ python/branches/py3k/Lib/test/pickletester.py	Sat May  2 23:41:14 2009
@@ -932,6 +932,20 @@
                              "Failed protocol %d: %r != %r"
                              % (proto, obj, loaded))
 
+    def test_attribute_name_interning(self):
+        # Test that attribute names of pickled objects are interned when
+        # unpickling.
+        for proto in protocols:
+            x = C()
+            x.foo = 42
+            x.bar = "hello"
+            s = self.dumps(x, proto)
+            y = self.loads(s)
+            x_keys = sorted(x.__dict__)
+            y_keys = sorted(y.__dict__)
+            for x_key, y_key in zip(x_keys, y_keys):
+                self.assertIs(x_key, y_key)
+
 # Test classes for reduce_ex
 
 class REX_one(object):

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat May  2 23:41:14 2009
@@ -109,6 +109,10 @@
 Library
 -------
 
+- Issue #5084: unpickling now interns the attribute names of pickled objects,
+  saving memory and avoiding growth in size of subsequent pickles. Proposal
+  and original patch by Jake McGuire.
+
 - The json module now works exclusively with str and not bytes.
 
 - Issue #3959: The ipaddr module has been added to the standard library.

Modified: python/branches/py3k/Modules/_pickle.c
==============================================================================
--- python/branches/py3k/Modules/_pickle.c	(original)
+++ python/branches/py3k/Modules/_pickle.c	Sat May  2 23:41:14 2009
@@ -4020,6 +4020,8 @@
     /* Set inst.__dict__ from the state dict (if any). */
     if (state != Py_None) {
         PyObject *dict;
+        PyObject *d_key, *d_value;
+        Py_ssize_t i;
 
         if (!PyDict_Check(state)) {
             PyErr_SetString(UnpicklingError, "state is not a dictionary");
@@ -4029,7 +4031,19 @@
         if (dict == NULL)
             goto error;
 
-        PyDict_Update(dict, state);
+        i = 0;
+        while (PyDict_Next(state, &i, &d_key, &d_value)) {
+            /* normally the keys for instance attributes are
+               interned.  we should try to do that here. */
+            Py_INCREF(d_key);
+            if (PyUnicode_CheckExact(d_key))
+                PyUnicode_InternInPlace(&d_key);
+            if (PyObject_SetItem(dict, d_key, d_value) < 0) {
+                Py_DECREF(d_key);
+                goto error;
+            }
+            Py_DECREF(d_key);
+        }
         Py_DECREF(dict);
     }