sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

python: When updating sys.path to include the Samba python path, avoid throwing away the changes made by site.py.

Browse Source
This commit is contained in:
Jelmer Vernooij 2009-12-29 16:07:54 +01:00 committed by Jelmer Vernooij
parent e2c4d8281d
commit 588b3e6181
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
source4/scripting/python/modules.c
View File

@ -61,10 +61,47 @@ void py_load_samba_modules(void)
}
}
void py_update_path(const char *bindir)
static bool PySys_PathPrepend(PyObject *list, const char *path)
{
PyObject *py_path = PyString_FromString(path);
if (py_path == NULL)
return false;
return (PyList_Insert(list, 0, py_path) == 0);
}
bool py_update_path(const char *bindir)
{
char *newpath;
asprintf(&newpath, "%s/python:%s/../scripting/python:%s", bindir, bindir, Py_GetPath());
PySys_SetPath(newpath);
PyObject *mod_sys, *py_path;
mod_sys = PyImport_ImportModule("sys");
if (mod_sys == NULL) {
return false;
}
py_path = PyObject_GetAttrString(mod_sys, "path");
if (py_path == NULL) {
return false;
}
if (!PyList_Check(py_path)) {
return false;
}
asprintf(&newpath, "%s/../scripting/python", bindir);
if (!PySys_PathPrepend(py_path, newpath)) {
free(newpath);
return false;
}
free(newpath);
asprintf(&newpath, "%s/python", bindir);
if (!PySys_PathPrepend(py_path, newpath)) {
free(newpath);
return false;
}
free(newpath);
return true;
}

2
source4/scripting/python/modules.h
View File

@ -21,7 +21,7 @@
#define __SAMBA_PYTHON_MODULES_H__
void py_load_samba_modules(void);
void py_update_path(const char *bindir);
bool py_update_path(const char *bindir);
#define py_iconv_convenience(mem_ctx) smb_iconv_convenience_init(mem_ctx, "ASCII", PyUnicode_GetDefaultEncoding(), true)