diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-15 16:56:15 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-15 16:56:15 +0200 |
| commit | dfedfae1cd1c1af54609fd56dafe8eb026f9382c (patch) | |
| tree | 7a07bcd46bf711f5ed5ed5d2dd5774f22bf5df94 /source4/pidl/lib/Parse/Pidl/Samba4/Python.pm | |
| parent | cb5873f36d5f67b51afd9327df114ff7c1b529d0 (diff) | |
| parent | 7bb2ebb884c35676a6cf03efe6ecc15b3e232a43 (diff) | |
| download | samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.tar.gz samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.tar.bz2 samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 66327b8bd8dbde140b93f000a81ba13e743f27b0)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/Samba4/Python.pm')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/Python.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm index acaea99f6d..2d12da358c 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm @@ -952,16 +952,15 @@ sub ConvertObjectToPythonLevel($$$$$) $self->pidl("}"); } } elsif ($l->{TYPE} eq "ARRAY") { - if (is_charset_array($e, $l)) { + my $pl = GetPrevLevel($e, $l); + if ($pl && $pl->{TYPE} eq "POINTER") { $var_name = get_pointer_to($var_name); + } + + if (is_charset_array($e, $l)) { # FIXME: Use Unix charset setting rather than utf-8 $self->pidl("$py_var = PyUnicode_Decode($var_name, strlen($var_name), \"utf-8\", \"ignore\");"); } else { - my $pl = GetPrevLevel($e, $l); - if ($pl && $pl->{TYPE} eq "POINTER") { - $var_name = get_pointer_to($var_name); - } - die("No SIZE_IS for array $var_name") unless (defined($l->{SIZE_IS})); my $length = $l->{SIZE_IS}; if (defined($l->{LENGTH_IS})) { |