[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
- Previous message: [Python-checkins] python/dist/src/Lib/test inspect_fodder2.py, 1.2,
1.3 test_csv.py, 1.14, 1.15 test_inspect.py, 1.18,
1.19 test_zlib.py, 1.27, 1.28
- Next message: [Python-checkins] python/dist/src/Python compile.c,2.338,2.339
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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);
- Previous message: [Python-checkins] python/dist/src/Lib/test inspect_fodder2.py, 1.2,
1.3 test_csv.py, 1.14, 1.15 test_inspect.py, 1.18,
1.19 test_zlib.py, 1.27, 1.28
- Next message: [Python-checkins] python/dist/src/Python compile.c,2.338,2.339
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Python-checkins
mailing list