[Python-checkins] cpython (merge 3.3 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/09c6faf1877c
changeset:   83593:09c6faf1877c
parent:      83590:8a364deb0225
parent:      83592:65cd71abebc8
user:        Raymond Hettinger <python at rcn.com>
date:        Fri May 03 02:41:02 2013 -0700
summary:
  merge

files:
  Lib/collections/__init__.py  |  4 ++++
  Lib/test/test_collections.py |  1 +
  Misc/ACKS                    |  1 +
  3 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -281,6 +281,10 @@
         'Return self as a plain tuple.  Used by copy and pickle.'
         return tuple(self)
 
+    def __getstate__(self):
+        'Exclude the OrderedDict from pickling'
+        return None
+
 {field_defs}
 '''
 
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -305,6 +305,7 @@
                 q = loads(dumps(p, protocol))
                 self.assertEqual(p, q)
                 self.assertEqual(p._fields, q._fields)
+                self.assertNotIn(b'OrderedDict', dumps(p, protocol))
 
     def test_copy(self):
         p = TestNT(x=10, y=20, z=30)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -829,6 +829,7 @@
 Jason Michalski
 Franck Michea
 Tom Middleton
+Thomas Miedema
 Stan Mihai
 Stefan Mihaila
 Aristotelis Mikropoulos

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