caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pybindings: Fix use of import in user scripts

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-04-17 10:57:19 +01:00
parent 659c932559
commit 90ceb829f3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/pybindings.cc
View File

@ -25,6 +25,7 @@
#include "jsonparse.h" #include "jsonparse.h"
#include "nextpnr.h" #include "nextpnr.h"
#include <boost/filesystem.hpp>
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <signal.h> #include <signal.h>
@ -233,6 +234,12 @@ void init_python(const char *executable, bool first)
PyImport_AppendInittab(TOSTRING(MODULE_NAME), PYINIT_MODULE_NAME); PyImport_AppendInittab(TOSTRING(MODULE_NAME), PYINIT_MODULE_NAME);
Py_SetProgramName(program); Py_SetProgramName(program);
Py_Initialize(); Py_Initialize();
// Add cwd to Python's search path so `import` can be used in user scripts
boost::filesystem::path cwd = boost::filesystem::absolute("./").normalize();
PyObject *sys_path = PySys_GetObject("path");
PyList_Insert(sys_path, 0, PyUnicode_FromString(cwd.string().c_str()));
PyImport_ImportModule(TOSTRING(MODULE_NAME)); PyImport_ImportModule(TOSTRING(MODULE_NAME));
PyRun_SimpleString("from " TOSTRING(MODULE_NAME) " import *"); PyRun_SimpleString("from " TOSTRING(MODULE_NAME) " import *");
} catch (boost::python::error_already_set const &) { } catch (boost::python::error_already_set const &) {