[Python-checkins] CVS: python/dist/src/Mac/Modules macconfig.c,1.29,1.30 macmodule.c,1.48,1.49

[Jack Jansen]

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

Modified Files:
	macconfig.c macmodule.c 
Log Message:
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).


Index: macconfig.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macconfig.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** macconfig.c	2001/11/06 15:56:41	1.29
--- macconfig.c	2001/11/30 14:16:31	1.30
***************
*** 159,162 ****
--- 159,165 ----
  extern void initthread();
  #endif
+ #ifdef WITH_HOTSHOT
+ extern void init_hotshot();
+ #endif
  #ifdef USE_PYEXPAT
  extern void initpyexpat();
***************
*** 288,291 ****
--- 291,297 ----
  #ifdef WITH_THREAD
  	{"thread",	initthread},
+ #endif
+ #ifdef WITH_HOTSHOT
+ 	{"_hotshot",	init_hotshot},
  #endif
  #ifdef USE_PYEXPAT

Index: macmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macmodule.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** macmodule.c	2001/11/06 12:10:05	1.48
--- macmodule.c	2001/11/30 14:16:31	1.49
***************
*** 115,120 ****
  
  
- static PyObject *MacError; /* Exception mac.error */
- 
  /* Set a MAC-specific error from errno, and return NULL */
  
--- 115,118 ----
***************
*** 122,126 ****
  mac_error() 
  {
! 	return PyErr_SetFromErrno(MacError);
  }
  
--- 120,124 ----
  mac_error() 
  {
! 	return PyErr_SetFromErrno(PyExc_OSError);
  }
  
***************
*** 296,301 ****
  	Py_END_ALLOW_THREADS
  	if (res == NULL) {
! 		PyErr_SetString(MacError, path);
! 		return NULL;
  	}
  	return PyString_FromString(res);
--- 294,298 ----
  	Py_END_ALLOW_THREADS
  	if (res == NULL) {
! 		return mac_error();
  	}
  	return PyString_FromString(res);
***************
*** 840,845 ****
  
  	/* Initialize mac.error exception */
! 	MacError = PyErr_NewException("mac.error", NULL, NULL);
! 	PyDict_SetItemString(d, "error", MacError);
  
  	PyStructSequence_InitType(&StatResultType, &stat_result_desc);
--- 837,841 ----
  
  	/* Initialize mac.error exception */
! 	PyDict_SetItemString(d, "error", PyExc_OSError);
  
  	PyStructSequence_InitType(&StatResultType, &stat_result_desc);