[Python-checkins] python/dist/src/Python pythonrun.c, 2.161.2.15, 2.161.2.16

kbk at users.sourceforge.net kbk at users.sourceforge.net
Fri Jan 7 18:25:21 CET 2005


Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24849/Python

Modified Files:
      Tag: ast-branch
	pythonrun.c 
Log Message:
Remove extra bracket from conflict merge.


Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.161.2.15
retrieving revision 2.161.2.16
diff -u -d -r2.161.2.15 -r2.161.2.16
--- pythonrun.c	7 Jan 2005 07:04:57 -0000	2.161.2.15
+++ pythonrun.c	7 Jan 2005 17:25:18 -0000	2.161.2.16
@@ -1444,7 +1444,6 @@
 		fprintf(stderr, "error=%d\n", err->error);
 		msg = "unknown parsing error";
 		break;
-		}
 	}
 	v = Py_BuildValue("(ziiz)", err->filename,
 			  err->lineno, err->offset, err->text);



More information about the Python-checkins mailing list