sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

pidl/python: Allow passing in UTF8 string objects as well as unicode

Browse Source 
objects for IDL strings.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Jelmer Vernooij 2010-09-20 22:18:45 -07:00 committed by Andrew Tridgell
parent d86d2256b9
commit 6a3c687f03
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pidl/lib/Parse/Pidl/Samba4/Python.pm
View File

@ -987,9 +987,21 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
}
if (is_charset_array($e, $l)) {
$self->pidl("PY_CHECK_TYPE(&PyUnicode_Type, $py_var, $fail);");
$self->pidl("if (PyUnicode_Check($py_var)) {");
$self->indent;
# FIXME: Use Unix charset setting rather than utf-8
$self->pidl($var_name . " = PyString_AsString(PyUnicode_AsEncodedString($py_var, \"utf-8\", \"ignore\"));");
$self->deindent;
$self->pidl("} else if (PyString_Check($py_var)) {");
$self->indent;
$self->pidl($var_name . " = PyString_AsString($py_var);");
$self->deindent;
$self->pidl("} else {");
$self->indent;
$self->pidl("PyErr_Format(PyExc_TypeError, \"Expected string or unicode object, got %s\", Py_TYPE($py_var)->tp_name);");
$self->pidl("$fail;");
$self->deindent;
$self->pidl("}");
} else {
my $counter = "$e->{NAME}_cntr_$l->{LEVEL_INDEX}";
$self->pidl("PY_CHECK_TYPE(&PyList_Type, $py_var, $fail);");