summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2013-04-14 07:58:28 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2013-04-14 07:58:28 (GMT)
commitbdc3eb76234f58d7ab9f215748cb73c4cb3c27e8 (patch)
treecaef451130410928acdf8e90a73a762a3c4ac725 /Lib
parente94950ea3f4241c0c228db685314c012515684b3 (diff)
parent6eea8184235cb83807dd96c32ee78eddc83a9dc9 (diff)
downloadcpython-bdc3eb76234f58d7ab9f215748cb73c4cb3c27e8.zip
cpython-bdc3eb76234f58d7ab9f215748cb73c4cb3c27e8.tar.gz
cpython-bdc3eb76234f58d7ab9f215748cb73c4cb3c27e8.tar.bz2
Merge 3.3
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_memoryio.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index 9e1b7c7..4de4f65 100644
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -379,8 +379,8 @@ class MemoryTestMixin:
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