pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-26 04:46:37 +02:00
Code Activity

scripts: fix script interpreter used after register during load of script in python/perl/ruby/lua/guile plugins (bug #41345)

Browse Source
This commit is contained in:
Sebastien Helleu
2014-01-25 13:04:25 +01:00
parent 97cede06b5
commit 86a99af606
14 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/python/weechat-python-api.c
+1
View File
@@ -143,6 +143,7 @@ weechat_python_api_register (PyObject *self, PyObject *args)
"version %s (%s)"),
PYTHON_PLUGIN_NAME, name, version, description);
}
python_current_script->interpreter = (PyThreadState *)python_current_interpreter;
}
else
{
src/plugins/python/weechat-python.c
+1 -2
View File
@@ -49,6 +49,7 @@ struct t_plugin_script *python_current_script = NULL;
struct t_plugin_script *python_registered_script = NULL;
const char *python_current_script_filename = NULL;
PyThreadState *python_mainThreadState = NULL;
PyThreadState *python_current_interpreter = NULL;
char *python2_bin = NULL;
/* outputs subroutines */
@@ -590,7 +591,6 @@ weechat_python_load (const char *filename)
wchar_t *wargv[] = { NULL, NULL };
#endif
FILE *fp;
PyThreadState *python_current_interpreter;
PyObject *weechat_outputs, *python_path, *path;
const char *weechat_home;
char *str_home;
@@ -754,7 +754,6 @@ weechat_python_load (const char *filename)
}
python_current_script = python_registered_script;
python_current_script->interpreter = (PyThreadState *) python_current_interpreter;
/* PyEval_ReleaseThread (python_current_script->interpreter); */
/*
src/plugins/python/weechat-python.h
+1
View File
@@ -42,6 +42,7 @@ extern struct t_plugin_script *last_python_script;
extern struct t_plugin_script *python_current_script;
extern struct t_plugin_script *python_registered_script;
extern const char *python_current_script_filename;
extern PyThreadState *python_current_interpreter;
extern PyObject *weechat_python_hashtable_to_dict (struct t_hashtable *hashtable);
extern struct t_hashtable *weechat_python_dict_to_hashtable (PyObject *dict,