diff options
author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2013-12-11 15:35:17 +0100 |
---|---|---|
committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2013-12-11 15:35:17 +0100 |
commit | 309a9ab6bc20159b2ad203d953d7b3e8e8c63669 (patch) | |
tree | c3f70acaedd50ccbe92deec5c7d8833c7f5374b5 | |
parent | 81bb9bd73de7ec1d5b9d89cad7cbe8495e2b60ab (diff) | |
download | lasso-309a9ab6bc20159b2ad203d953d7b3e8e8c63669.tar.gz lasso-309a9ab6bc20159b2ad203d953d7b3e8e8c63669.tar.xz lasso-309a9ab6bc20159b2ad203d953d7b3e8e8c63669.zip |
bindings/python: automatically encode string into utf-8 when passing unicode string to Lasso methods
fixes #4077
-rw-r--r-- | bindings/python/lang.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/bindings/python/lang.py b/bindings/python/lang.py index 1e3c89cc..f5c9d36e 100644 --- a/bindings/python/lang.py +++ b/bindings/python/lang.py @@ -122,6 +122,11 @@ def cptrToPy(cptr): o._cptr = cptr return o +def str2lasso(s): + if isinstance(s, unicode): + return s.encode('utf-8') + return s + class frozendict(dict): \'\'\'Immutable dict\'\'\' # from Python Cookbook: @@ -325,6 +330,8 @@ if WSF_SUPPORT: py_args.append(get_python_arg_decl(arg)) if not is_int(arg, self.binding_data) and is_object(arg): c_args.append('%(name)s and %(name)s._cptr' % { 'name' : arg_name(arg) }) + elif is_cstring(arg): + c_args.append('str2lasso(%s)' % arg_name(arg)) else: c_args.append(arg_name(arg)) py_args = remove_bad_optional(py_args) @@ -352,6 +359,8 @@ if WSF_SUPPORT: if not is_int(arg, self.binding_data) and is_object(arg): c_args.append('%s and %s._cptr' % (aname, aname)) + elif is_cstring(arg): + c_args.append('str2lasso(%s)' % arg_name(arg)) else: c_args.append(aname) opt = False @@ -411,6 +420,8 @@ if WSF_SUPPORT: print >> fd, ' def set_%s(self, value):' % mname if is_int(m, self.binding_data) or is_xml_node(m) or is_cstring(m) or is_boolean(m): pass + elif is_cstring(m): + print >> fd, ' value = str2lasso(value)' elif is_object(m): print >> fd, ' if value is not None:' print >> fd, ' value = value and value._cptr' @@ -465,6 +476,8 @@ if WSF_SUPPORT: if is_out(arg): c_args.append(outvar) + elif is_cstring(arg): + c_args.append('str2lasso(%s)' % arg_name(arg)) elif is_xml_node(arg) or is_boolean(arg) or is_cstring(arg) or is_int(arg, self.binding_data) or is_glist(arg) or is_hashtable(arg) or is_time_t_pointer(arg): c_args.append(arg_name(arg)) elif is_object(arg): |