[Python-checkins] CVS: python/dist/src/Modules xxsubtype.c,1.1,2.1 Setup.dist,1.21,1.22 cPickle.c,2.60,2.61 config.c.in,1.73,1.74

[Tim Peters]

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

Modified Files:
	Setup.dist cPickle.c config.c.in 
Added Files:
	xxsubtype.c 
Log Message:
Merge of descr-branch back into trunk.



Index: Setup.dist
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/Setup.dist,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Setup.dist	2001/03/22 22:18:55	1.21
--- Setup.dist	2001/08/02 04:15:00	1.22
***************
*** 465,466 ****
--- 465,468 ----
  # xx xxmodule.c
  
+ # Another example -- the 'xxsubtype' module shows C-level subtyping in action
+ xxsubtype xxsubtype.c

Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.60
retrieving revision 2.61
diff -C2 -d -r2.60 -r2.61
*** cPickle.c	2001/07/17 18:34:03	2.60
--- cPickle.c	2001/08/02 04:15:00	2.61
***************
*** 1870,1873 ****
--- 1870,1877 ----
                  goto finally;
              }
+ 	    if (type == &PyType_Type) {
+ 		res = save_global(self, args, NULL);
+ 		goto finally;
+ 	    }
              break;
  

Index: config.c.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/config.c.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** config.c.in	2001/01/23 21:46:57	1.73
--- config.c.in	2001/08/02 04:15:00	1.74
***************
*** 38,42 ****
  	{"__builtin__", NULL},
  	{"sys", NULL},
! 	{"exceptions", init_exceptions},
  
  	/* Sentinel */
--- 38,42 ----
  	{"__builtin__", NULL},
  	{"sys", NULL},
! 	{"exceptions", NULL},
  
  	/* Sentinel */