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

[alexandre.vassalotti]

http://hg.python.org/cpython/rev/b5640f265c11
changeset:   83323:b5640f265c11
parent:      83321:c2e913424a4a
parent:      83322:8345b0dcb5e2
user:        Alexandre Vassalotti <alexandre at peadrop.com>
date:        Sun Apr 14 00:58:28 2013 -0700
summary:
  Merge 3.3

files:
  Lib/test/test_memoryio.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -379,8 +379,8 @@
                 self.assertEqual(obj.__class__, obj2.__class__)
                 self.assertEqual(obj.foo, obj2.foo)
                 self.assertEqual(obj.tell(), obj2.tell())
-                obj.close()
-                self.assertRaises(ValueError, pickle.dumps, obj, proto)
+                obj2.close()
+                self.assertRaises(ValueError, pickle.dumps, obj2, proto)
         del __main__.PickleTestMemIO
 
 

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