[Python-checkins] python/dist/src/Lib pickle.py,1.71,1.72

[jhylton@users.sourceforge.net]

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

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










Index: pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pickle.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** pickle.py	19 Sep 2002 23:00:12 -0000	1.71
--- pickle.py	13 Nov 2002 22:01:26 -0000	1.72
***************
*** 189,200 ****
          return GET + `i` + '\n'
  
!     def save(self, object, pers_save = 0):
          memo = self.memo
  
!         if not pers_save:
!             pid = self.persistent_id(object)
!             if pid is not None:
!                 self.save_pers(pid)
!                 return
  
          d = id(object)
--- 189,199 ----
          return GET + `i` + '\n'
  
!     def save(self, object):
          memo = self.memo
  
!         pid = self.persistent_id(object)
!         if pid is not None:
!             self.save_pers(pid)
!             return
  
          d = id(object)
***************
*** 216,224 ****
              f = self.dispatch[t]
          except KeyError:
-             pid = self.inst_persistent_id(object)
-             if pid is not None:
-                 self.save_pers(pid)
-                 return
- 
              try:
                  issc = issubclass(t, TypeType)
--- 215,218 ----
***************
*** 280,291 ****
          return None
  
-     def inst_persistent_id(self, object):
-         return None
- 
      def save_pers(self, pid):
          if not self.bin:
              self.write(PERSID + str(pid) + '\n')
          else:
!             self.save(pid, 1)
              self.write(BINPERSID)
  
--- 274,282 ----
          return None
  
      def save_pers(self, pid):
          if not self.bin:
              self.write(PERSID + str(pid) + '\n')
          else:
!             self.save(pid)
              self.write(BINPERSID)