adapted to new naming; clarify comments somewhat

diff --git a/Demo/embed/Makefile b/Demo/embed/Makefile
index d63a9d4462111d63d058fbb5e44c9f1561806ba5..9835c30ae2eb276d24dfe81c905ad199c4738c07 100644 (file)
--- a/Demo/embed/Makefile
+++ b/Demo/embed/Makefile
@@ -10,12 +10,13 @@ INCLUDES=   -I$(srcdir)/Include -I$(blddir)
 DEFINES=       -DHAVE_CONFIG_H
 CFLAGS=                $(OPT) $(DEFINES) $(INCLUDES)
 
-# Libraries
-# XXX edit MODLIBS, LIBS and SYSLIBS to match $(blddir)/Modules/Makefile
+# Libraries (must be in this order!)
 MYLIBS=                $(blddir)/Modules/libModules.a \
                $(blddir)/Python/libPython.a \
                $(blddir)/Objects/libObjects.a \
                $(blddir)/Parser/libParser.a
+
+# XXX edit MODLIBS, LIBS and SYSLIBS to match $(blddir)/Modules/Makefile
 MODLIBS=       
 LIBS=          
 SYSLIBS=       -lm

diff --git a/Demo/embed/README b/Demo/embed/README
index 62b6513029e1bb34a03cca8efd3af3cbc6f0bcc4..8858c713e44bc34e6493216579e542ad86008f88 100644 (file)
--- a/Demo/embed/README
+++ b/Demo/embed/README
@@ -1,6 +1,6 @@
-This directory show how easy it is to embed the Python interpreter in
-your own application.  The file demo.c shows you all that is needed in
-your C code.
+This directory show how to embed the Python interpreter in your own
+application.  The file demo.c shows you all that is needed in your C
+code.
 
 To build it, you may have to edit the Makefile:
 

diff --git a/Demo/embed/demo.c b/Demo/embed/demo.c
index b1adde2ae36f8673c97115727fba5c8d4e01f082..418b225cf615b50dea6f39a66077a1c9322e0393 100644 (file)
--- a/Demo/embed/demo.c
+++ b/Demo/embed/demo.c
@@ -1,6 +1,6 @@
 /* Example of embedding Python in another program */
 
-#include "allobjects.h"
+#include "Python.h"
 
 static char *argv0;
 
@@ -12,21 +12,21 @@ main(argc, argv)
        argv0 = argv[0];
 
        /* Initialize the Python interpreter.  Required. */
-       initall();
+       Py_Initialize();
 
        /* Define sys.argv.  It is up to the application if you
           want this; you can also let it undefined (since the Python 
           code is generally not a main program it has no business
           touching sys.argv...) */
-       setpythonargv(argc, argv);
+       PySys_SetArgv(argc, argv);
 
        /* Do some application specific code */
        printf("Hello, brave new world\n\n");
 
        /* Execute some Python statements (in module __main__) */
-       run_command("import sys\n");
-       run_command("print sys.builtin_module_names\n");
-       run_command("print sys.argv\n");
+       PyRun_SimpleString("import sys\n");
+       PyRun_SimpleString("print sys.builtin_module_names\n");
+       PyRun_SimpleString("print sys.argv\n");
 
        /* Note that you can call any public function of the Python
           interpreter here, e.g. call_object(). */
@@ -35,10 +35,11 @@ main(argc, argv)
        printf("\nGoodbye, cruel world\n");
 
        /* Exit, cleaning up the interpreter */
-       goaway(0);
+       Py_Exit(0);
        /*NOTREACHED*/
 }
 
+/* This function is called by the interpreter to get its own name */
 char *
 getprogramname()
 {