[Python-checkins] python/dist/src/Python pythonrun.c,2.186,2.187

2003年4月17日 08:24:28 -0700

Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv30146/python/Python
Modified Files:
	pythonrun.c 
Log Message:
Trimmed trailing whitespace.
Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.186
retrieving revision 2.187
diff -C2 -d -r2.186 -r2.187
*** pythonrun.c	17 Apr 2003 15:21:01 -0000	2.186
--- pythonrun.c	17 Apr 2003 15:24:21 -0000	2.187
***************
*** 114,118 ****
 		return;
 	initialized = 1;
! 	
 	if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '0円')
 		Py_DebugFlag = add_flag(Py_DebugFlag, p);
--- 114,118 ----
 		return;
 	initialized = 1;
! 
 	if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '0円')
 		Py_DebugFlag = add_flag(Py_DebugFlag, p);
***************
*** 524,528 ****

 int
! PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit, 
 		 PyCompilerFlags *flags)
 {
--- 524,528 ----

 int
! PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
 		 PyCompilerFlags *flags)
 {
***************
*** 689,693 ****
 		if (ftell(fp) == 0) {
 			if (fread(buf, 1, 2, fp) == 2 &&
! 			 ((unsigned int)buf[1]<<8 | buf[0]) == halfmagic) 
 				ispyc = 1;
 			rewind(fp);
--- 689,693 ----
 		if (ftell(fp) == 0) {
 			if (fread(buf, 1, 2, fp) == 2 &&
! 			 ((unsigned int)buf[1]<<8 | buf[0]) == halfmagic)
 				ispyc = 1;
 			rewind(fp);
***************
*** 696,700 ****
 	}
 	return 0;
! } 

 int
--- 696,700 ----
 	}
 	return 0;
! }

 int
***************
*** 739,743 ****
 		v = run_pyc_file(fp, filename, d, d, flags);
 	} else {
! 		v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d, 
 				 closeit, flags);
 	}
--- 739,743 ----
 		v = run_pyc_file(fp, filename, d, d, flags);
 	} else {
! 		v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d,
 				 closeit, flags);
 	}
***************
*** 1018,1022 ****
 			else {
 				char* modstr = PyString_AsString(moduleName);
! 				if (modstr && strcmp(modstr, "exceptions")) 
 				{
 					err = PyFile_WriteString(modstr, f);
--- 1018,1022 ----
 			else {
 				char* modstr = PyString_AsString(moduleName);
! 				if (modstr && strcmp(modstr, "exceptions"))
 				{
 					err = PyFile_WriteString(modstr, f);
***************
*** 1097,1101 ****
 {
 	return PyRun_FileExFlags(fp, filename, start, globals, locals, 0,
! 				 flags); 
 }

--- 1097,1101 ----
 {
 	return PyRun_FileExFlags(fp, filename, start, globals, locals, 0,
! 				 flags);
 }

***************
*** 1174,1178 ****

 PyObject *
! Py_CompileStringFlags(const char *str, const char *filename, int start, 
 		 PyCompilerFlags *flags)
 {
--- 1174,1178 ----

 PyObject *
! Py_CompileStringFlags(const char *str, const char *filename, int start,
 		 PyCompilerFlags *flags)
 {
***************
*** 1250,1254 ****
 	perrdetail err;

! 	n = PyParser_ParseStringFlagsFilename(str, filename, 
 					 &_PyParser_Grammar,
 					 start, &err, flags);
--- 1250,1254 ----
 	perrdetail err;

! 	n = PyParser_ParseStringFlagsFilename(str, filename,
 					 &_PyParser_Grammar,
 					 start, &err, flags);
***************
*** 1482,1486 ****

! #if defined(USE_STACKCHECK) 
 #if defined(WIN32) && defined(_MSC_VER)

--- 1482,1486 ----

! #if defined(USE_STACKCHECK)
 #if defined(WIN32) && defined(_MSC_VER)