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

improved module aliasing

Browse Source
This commit is contained in:
roberto@precise64
2012-03-30 10:17:30 +02:00
parent c2d7b65145
commit 81f0f93d96
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/python/python_plugin.c
+10 -9
View File
@@ -400,6 +400,14 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) {
return NULL;
}
if (is_a_package) {
py_file_module = PyImport_AddModule(name);
if (py_file_module) {
PyModule_AddObject(py_file_module, "__path__", Py_BuildValue("[O]", PyString_FromString(filename)));
}
free(real_filename);
}
py_file_module = PyImport_ExecCodeModule(name, py_compiled_node);
if (!py_file_module) {
PyErr_Print();
@@ -408,14 +416,6 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) {
Py_DECREF(py_compiled_node);
if (is_a_package) {
PyObject *py_file_module_dict = PyModule_GetDict(py_file_module);
if (py_file_module_dict) {
PyDict_SetItemString(py_file_module_dict, "__path__", Py_BuildValue("[O]", PyString_FromString(filename)));
}
free(real_filename);
}
return py_file_module;
#endif
@@ -1019,7 +1019,7 @@ void uwsgi_python_init_apps() {
char *value = strchr(uppa->value, '=');
if (!value) {
uwsgi_log("invalid pymodule-alias syntax\n");
continue;
goto next;
}
value[0] = 0;
if (!strchr(value + 1, '/')) {
@@ -1044,6 +1044,7 @@ void uwsgi_python_init_apps() {
// reset original value
value[0] = '=';
next:
uppa = uppa->next;
}