[Python-checkins] python/dist/src/Lib/test test_pickle.py,1.11,1.12

[jhylton@users.sourceforge.net]

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

Modified Files:
	test_pickle.py 
Log Message:
Remove inst_persistent_id() WANNI (we ain't never needed it).
Add some simple tests of the persistence hooks.










Index: test_pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pickle.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_pickle.py	30 Jul 2002 23:27:11 -0000	1.11
--- test_pickle.py	13 Nov 2002 22:01:27 -0000	1.12
***************
*** 2,6 ****
  import unittest
  from cStringIO import StringIO
! from test.pickletester import AbstractPickleTests, AbstractPickleModuleTests
  from test import test_support
  
--- 2,7 ----
  import unittest
  from cStringIO import StringIO
! from test.pickletester import AbstractPickleTests, AbstractPickleModuleTests, \
!      AbstractPersistentPicklerTests
  from test import test_support
  
***************
*** 30,33 ****
--- 31,54 ----
          return u.load()
  
+ class PersPicklerTests(AbstractPersistentPicklerTests):
+ 
+     def dumps(self, arg, bin=0):
+         class PersPickler(pickle.Pickler):
+             def persistent_id(subself, obj):
+                 return self.persistent_id(obj)
+         f = StringIO()
+         p = PersPickler(f, bin)
+         p.dump(arg)
+         f.seek(0)
+         return f.read()
+ 
+     def loads(self, buf):
+         class PersUnpickler(pickle.Unpickler):
+             def persistent_load(subself, obj):
+                 return self.persistent_load(obj)
+         f = StringIO(buf)
+         u = PersUnpickler(f)
+         return u.load()
+ 
  def test_main():
      loader = unittest.TestLoader()
***************
*** 35,38 ****
--- 56,60 ----
      suite.addTest(loader.loadTestsFromTestCase(PickleTests))
      suite.addTest(loader.loadTestsFromTestCase(PicklerTests))
+     suite.addTest(loader.loadTestsFromTestCase(PersPicklerTests))
      test_support.run_suite(suite)