pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-24 20:06:38 +02:00
Code Activity

python: send "bytes" instead of "str" to callbacks in Python 3 when the string is not UTF-8 valid (issue #1220, closes #1389)

Browse Source
This commit is contained in:
Sébastien Helleu
2019-10-12 22:21:48 +02:00
parent 8fc8f728d4
commit 513f5a1ee7
13 changed files with 903 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/python/weechat-python.c
+28 -3
View File
@@ -446,12 +446,13 @@ weechat_python_output (PyObject *self, PyObject *args)
void *
weechat_python_exec (struct t_plugin_script *script,
int ret_type, const char *function,
char *format, void **argv)
const char *format, void **argv)
{
struct t_plugin_script *old_python_current_script;
PyThreadState *old_interpreter;
PyObject *evMain, *evDict, *evFunc, *rc;
void *argv2[16], *ret_value, *ret_temp;
char format2[17];
int i, argc, *ret_int;
ret_value = NULL;
@@ -485,9 +486,33 @@ weechat_python_exec (struct t_plugin_script *script,
argc = strlen (format);
for (i = 0; i < 16; i++)
{
argv2[i] = (i < argc) ? argv[i] : NULL;
if (i < argc)
{
argv2[i] = argv[i];
if (format[i] == 's')
{
#if PY_MAJOR_VERSION >= 3
if (weechat_utf8_is_valid (argv2[i], -1, NULL))
format2[i] = 's'; /* Python 3: str */
else
format2[i] = 'y'; /* Python 3: bytes */
#else
format2[i] = 's'; /* Python 2: str */
#endif
}
else
{
format2[i] = format[i];
}
}
else
{
argv2[i] = NULL;
}
}
rc = PyObject_CallFunction (evFunc, format,
format2[argc] = '\0';
rc = PyObject_CallFunction (evFunc, format2,
argv2[0], argv2[1],
argv2[2], argv2[3],
argv2[4], argv2[5],
src/plugins/python/weechat-python.h
+1 -1
View File
@@ -61,6 +61,6 @@ extern struct t_hashtable *weechat_python_dict_to_hashtable (PyObject *dict,
const char *type_values);
extern void *weechat_python_exec (struct t_plugin_script *script,
int ret_type, const char *function,
char *format, void **argv);
const char *format, void **argv);
#endif /* WEECHAT_PLUGIN_PYTHON_H */