[Python-checkins] python/dist/src/Lib/test pickletester.py,1.46,1.47

[tim_one@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv10788/python/Lib/test

Modified Files:
	pickletester.py 
Log Message:
Implemented batching for dicts in cPickle.  This is after two failed
attempts to merge the C list-batch and dict-batch code -- they worked, but
it was a godawful mess to read.


Index: pickletester.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/pickletester.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** pickletester.py	11 Feb 2003 21:06:15 -0000	1.46
--- pickletester.py	11 Feb 2003 22:43:24 -0000	1.47
***************
*** 695,715 ****
                  self.failUnless(num_appends >= 2)
  
- # XXX Temporary hack, so long as the C implementation of pickle protocol
- # XXX 2 isn't ready.  When it is, move the methods in TempAbstractPickleTests
- # XXX into AbstractPickleTests above, and get rid of TempAbstractPickleTests
- # XXX along with the references to it in test_pickle.py.
- class TempAbstractPickleTests(unittest.TestCase):
- 
-     def test_newobj_list_slots(self):
-         x = SlotList([1, 2, 3])
-         x.foo = 42
-         x.bar = "hello"
-         s = self.dumps(x, 2)
-         y = self.loads(s)
-         self.assertEqual(list(x), list(y))
-         self.assertEqual(x.__dict__, y.__dict__)
-         self.assertEqual(x.foo, y.foo)
-         self.assertEqual(x.bar, y.bar)
- 
      def test_dict_chunking(self):
          n = 10  # too small to chunk
--- 695,698 ----
***************
*** 733,736 ****
--- 716,736 ----
              else:
                  self.failUnless(num_setitems >= 2)
+ 
+ # XXX Temporary hack, so long as the C implementation of pickle protocol
+ # XXX 2 isn't ready.  When it is, move the methods in TempAbstractPickleTests
+ # XXX into AbstractPickleTests above, and get rid of TempAbstractPickleTests
+ # XXX along with the references to it in test_pickle.py.
+ class TempAbstractPickleTests(unittest.TestCase):
+ 
+     def test_newobj_list_slots(self):
+         x = SlotList([1, 2, 3])
+         x.foo = 42
+         x.bar = "hello"
+         s = self.dumps(x, 2)
+         y = self.loads(s)
+         self.assertEqual(list(x), list(y))
+         self.assertEqual(x.__dict__, y.__dict__)
+         self.assertEqual(x.foo, y.foo)
+         self.assertEqual(x.bar, y.bar)
  
  class MyInt(int):