[Python-checkins] python/dist/src/Python bltinmodule.c,2.307,2.308

Mon Feb 2 08:39:04 EST 2004

Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18238/Python
Modified Files:
	bltinmodule.c 
Log Message:
Fix input() builtin function to respect compiler flags.
(SF patch 876178, patch by mwh, unittest by perky)
Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.307
retrieving revision 2.308
diff -C2 -d -r2.307 -r2.308
*** bltinmodule.c	4 Jan 2004 11:00:07 -0000	2.307
--- bltinmodule.c	2 Feb 2004 13:39:01 -0000	2.308
***************
*** 980,983 ****
--- 980,984 ----
 	PyObject *res;
 	PyObject *globals, *locals;
+ 	PyCompilerFlags cf;
 
 	line = builtin_raw_input(self, args);
***************
*** 995,999 ****
 			return NULL;
 	}
! 	res = PyRun_String(str, Py_eval_input, globals, locals);
 	Py_DECREF(line);
 	return res;
--- 996,1002 ----
 			return NULL;
 	}
! 	cf.cf_flags = 0;
! 	PyEval_MergeCompilerFlags(&cf);
! 	res = PyRun_StringFlags(str, Py_eval_input, globals, locals, &cf);
 	Py_DECREF(line);
 	return res;