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

[jhylton@users.sourceforge.net]

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

Modified Files:
      Tag: ast-branch
	pythonrun.c 
Log Message:
Fixer typos in PyParser_SimpleParseString and File.

The #defines were wrong.  Fixing them required twiddling the actual
definitions, too.



Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.161.2.16
retrieving revision 2.161.2.17
diff -u -d -r2.161.2.16 -r2.161.2.17
--- pythonrun.c	7 Jan 2005 17:25:18 -0000	2.161.2.16
+++ pythonrun.c	11 Oct 2005 22:03:13 -0000	2.161.2.17
@@ -1312,12 +1312,6 @@
 	return n;
 }
 
-node *
-PyParser_SimpleParseFile(FILE *fp, const char *filename, int start)
-{
-	return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
-}
-
 /* Simplified interface to parsestring -- return node or set exception */
 
 node *
@@ -1333,12 +1327,6 @@
 }
 
 node *
-PyParser_SimpleParseString(const char *str, int start)
-{
-	return PyParser_SimpleParseStringFlags(str, start, 0);
-}
-
-node *
 PyParser_SimpleParseStringFlagsFilename(const char *str, const char *filename,
 					int start, int flags)
 {
@@ -1642,3 +1630,21 @@
 	return oldhandler;
 #endif
 }
+
+/* Deprecated C API functions still provided for binary compatiblity */
+
+#undef PyParser_SimpleParseFile
+#undef PyParser_SimpleParseString
+
+node *
+PyParser_SimpleParseFile(FILE *fp, const char *filename, int start)
+{
+	return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
+}
+
+node *
+PyParser_SimpleParseString(const char *str, int start)
+{
+	return PyParser_SimpleParseStringFlags(str, start, 0);
+}
+