[Python-checkins] python/dist/src/Modules cPickle.c,2.73.2.1,2.73.2.1.2.1

[jhylton@users.sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	cPickle.c 
Log Message:
Given the persistent id code a shot at a class before calling save_global().

Backported from the trunk.



Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.73.2.1
retrieving revision 2.73.2.1.2.1
diff -C2 -d -r2.73.2.1 -r2.73.2.1.2.1
*** cPickle.c	21 Dec 2001 15:26:05 -0000	2.73.2.1
--- cPickle.c	16 Jul 2002 20:02:15 -0000	2.73.2.1.2.1
***************
*** 1993,2001 ****
      }
  
-     if (PyType_IsSubtype(type, &PyType_Type)) {
- 	res = save_global(self, args, NULL);
- 	goto finally;
-     }
- 
      if (!pers_save && self->inst_pers_func) {
          if ((tmp = save_pers(self, args, self->inst_pers_func)) != 0) {
--- 1993,1996 ----
***************
*** 2003,2006 ****
--- 1998,2006 ----
              goto finally;
          }
+     }
+ 
+     if (PyType_IsSubtype(type, &PyType_Type)) {
+ 	res = save_global(self, args, NULL);
+ 	goto finally;
      }