From 15d0166340baea91f117ea977539894e7444ee6b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 5 Feb 2011 18:00:45 +1100 Subject: s4-python Don't force "bin" into the python sys.path This patch uses the fact that dyn_PYTHONDIR and dyn_PYTHONARCHDIR is now set properly at all times, incluidng for installed and build-directory binaries. So we don't need to make assumptions about bin being magic any more. Andrew Bartlett --- source4/web_server/wsgi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/web_server') diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c index 2f47af2d25..37ded29480 100644 --- a/source4/web_server/wsgi.c +++ b/source4/web_server/wsgi.c @@ -385,7 +385,8 @@ bool wsgi_initialize(struct web_server_data *wdata) Py_Initialize(); - py_update_path("bin"); /* FIXME: Can't assume this is always the case */ + py_update_path(); /* Ensure that we have the Samba paths at + * the start of the sys.path() */ if (PyType_Ready(&web_request_Type) < 0) return false; -- cgit