[Python-checkins] CVS: python/dist/src/Python import.c,2.153,2.153.2.1

2001年3月30日 11:45:15 -0800

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv27821/Python
Modified Files:
 Tag: release20-maint
	import.c 
Log Message:
- Importing should now be safe with multiple Py_Initialize/Py_Finalize
 sequences.
Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.153
retrieving revision 2.153.2.1
diff -C2 -r2.153 -r2.153.2.1
*** import.c	2000年10月03日 16:02:05	2.153
--- import.c	2001年03月30日 19:45:12	2.153.2.1
***************
*** 1843,1847 ****
 	static PyObject *builtins_str = NULL;
 	static PyObject *import_str = NULL;
- 	static PyObject *standard_builtins = NULL;
 	PyObject *globals = NULL;
 	PyObject *import = NULL;
--- 1843,1846 ----
***************
*** 1874,1886 ****
 		PyErr_Clear();
 
! 		if (standard_builtins == NULL) {
! 			standard_builtins =
! 				PyImport_ImportModule("__builtin__");
! 			if (standard_builtins == NULL)
! 				return NULL;
! 		}
! 
! 		builtins = standard_builtins;
! 		Py_INCREF(builtins);
 		globals = Py_BuildValue("{OO}", builtins_str, builtins);
 		if (globals == NULL)
--- 1873,1880 ----
 		PyErr_Clear();
 
! 		builtins = PyImport_ImportModuleEx("__builtin__",
! 		 NULL, NULL, NULL);
! 		if (builtins == NULL)
! 			return NULL;
 		globals = Py_BuildValue("{OO}", builtins_str, builtins);
 		if (globals == NULL)