X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=27434074700d3360b9a888dba71375091ee97c34;hb=e2069b5792a80ba8ccfd03c9d1bdd5e364dbee10;hp=2144ab4a6e1a7c6e433043ccbe43d7b735bb9b45;hpb=3d8a035a9a230b729bc0c0c6ed6cee95169bd51e;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index 2144ab4a..27434074 100644 --- a/src/python.cc +++ b/src/python.cc @@ -28,11 +28,11 @@ void python_init(char *argv0) init_ob(); // prepend the openbox directories for python scripts to the sys path PyRun_SimpleString("import sys"); - PyRun_SimpleString("sys.path.insert('0, " SCRIPTDIR "')"); + PyRun_SimpleString("sys.path.insert(0, '" SCRIPTDIR "')"); PyRun_SimpleString(const_cast(("sys.path.insert(0, '" + otk::expandTilde("~/.openbox/python") + "')").c_str())); - PyRun_SimpleString("import ob; import otk;");// import config;"); + PyRun_SimpleString("import ob; import otk; import config;"); // set up convenience global variables PyRun_SimpleString("ob.openbox = ob.Openbox_instance()"); PyRun_SimpleString("otk.display = otk.Display_instance()"); @@ -44,14 +44,14 @@ void python_init(char *argv0) void python_destroy() { - Py_DECREF(obdict); + Py_Finalize(); } bool python_exec(const std::string &path) { FILE *rcpyfd = fopen(path.c_str(), "r"); if (!rcpyfd) { - printf("failed to load python file %s\n", path.c_str()); + printf("Failed to load python file %s\n", path.c_str()); return false; } PyRun_SimpleFile(rcpyfd, const_cast(path.c_str()));