clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-10-04 16:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

unlimited pythonpath entries

Browse Source
This commit is contained in:
roberto@natty32
2011-04-27 15:56:33 +02:00
parent 052aacfd36
commit 01ab891c11
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/python/python_plugin.c
+7 -10
View File
@@ -324,13 +324,16 @@ void init_uwsgi_vars() {
PyErr_Print();
}
for (i = 0; i < up.python_path_cnt; i++) {
if (PyList_Insert(pypath, 0, UWSGI_PYFROMSTRING(up.python_path[i])) != 0) {
struct uwsgi_string_list *uppp = up.python_path;
while(uppp) {
if (PyList_Insert(pypath, 0, UWSGI_PYFROMSTRING(uppp->value)) != 0) {
PyErr_Print();
}
else {
uwsgi_log("added %s to pythonpath.\n", up.python_path[i]);
uwsgi_log("added %s to pythonpath.\n", uppp->value);
}
uppp = uppp->next;
}
for (i = 0; i < up.pymodule_alias_cnt; i++) {
@@ -679,13 +682,7 @@ int uwsgi_python_manage_options(int i, char *optarg) {
}
return 1;
case LONG_ARGS_PYTHONPATH:
if (up.python_path_cnt < MAX_PYTHONPATH) {
up.python_path[up.python_path_cnt] = optarg;
up.python_path_cnt++;
}
else {
uwsgi_log("you can specify at most %d --pythonpath options\n", MAX_PYTHONPATH);
}
uwsgi_string_new_list(&up.python_path, optarg);
return 1;
case LONG_ARGS_PYARGV:
up.argv = optarg;
plugins/python/uwsgi_python.h
+1 -3
View File
@@ -3,7 +3,6 @@
#include <frameobject.h>
#define MAX_PYTHONPATH 64
#define MAX_PYMODULE_ALIAS 64
#define MAX_PYARGV 10
@@ -91,8 +90,7 @@ struct uwsgi_python {
char *test_module;
char *python_path[MAX_PYTHONPATH];
int python_path_cnt;
struct uwsgi_string_list *python_path;
PyObject *loader_dict;
PyObject* (*loaders[LOADER_MAX]) (void *);