sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

python: Be more pythonic - turn WERROR and NTSTATUS return codes into exceptions.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-01-14 15:25:09 +01:00
parent bd3e6c41c4
commit 16fc69b843
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/pidl/lib/Parse/Pidl/Samba4/Python.pm
View File

@ -298,7 +298,7 @@ sub PythonFunction($$$)
$self->pidl("}");
if ($fn->{RETURN_TYPE}) {
$result_size++;
$result_size++ unless ($fn->{RETURN_TYPE} eq "WERROR" or $fn->{RETURN_TYPE} eq "NTSTATUS");
}
foreach my $e (@{$fn->{ELEMENTS}}) {
@ -329,7 +329,11 @@ sub PythonFunction($$$)
}
}
if (defined($fn->{RETURN_TYPE})) {
if (defined($fn->{RETURN_TYPE}) and $fn->{RETURN_TYPE} eq "NTSTATUS") {
$self->handle_ntstatus("r->out.result", "NULL", "mem_ctx");
} elsif (defined($fn->{RETURN_TYPE}) and $fn->{RETURN_TYPE} eq "WERROR") {
$self->handle_werror("r->out.result", "NULL", "mem_ctx");
} elsif (defined($fn->{RETURN_TYPE})) {
my $conv = $self->ConvertObjectToPythonData("r", $fn->{RETURN_TYPE}, "r->out.result");
if ($result_size > 1) {
$self->pidl("PyTuple_SetItem(result, $i, $conv);");
@ -345,6 +349,20 @@ sub PythonFunction($$$)
$self->pidl("");
}
sub handle_werror($$$$)
{
my ($self, $var, $retval, $mem_ctx) = @_;
$self->pidl("if (!W_ERROR_IS_OK($var)) {");
$self->indent;
$self->pidl("PyErr_SetString(PyExc_RuntimeError, win_errstr($var));");
$self->pidl("talloc_free($mem_ctx);") if ($mem_ctx);
$self->pidl("return $retval;");
$self->deindent;
$self->pidl("}");
$self->pidl("");
}
sub handle_ntstatus($$$$)
{
my ($self, $var, $retval, $mem_ctx) = @_;

39
source/scripting/python/samba/tests/dcerpc/registry.py
View File

@ -17,26 +17,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#!/usr/bin/python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import winreg
from param import LoadParm
import unittest
@ -47,7 +27,24 @@ class WinregTests(unittest.TestCase):
lp_ctx.load("st/client/client.conf")
self.conn = winreg.winreg("ncalrpc:", lp_ctx)
def get_hklm(self):
return self.conn.OpenHKLM(None,
winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
def test_hklm(self):
(handle, _) = self.conn.OpenHKLM(None,
handle = self.conn.OpenHKLM(None,
winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
self.conn.CloseKey(handle)
def test_getversion(self):
handle = self.get_hklm()
version = self.conn.GetVersion(handle)
self.assertEquals(int, version.__class__)
self.conn.CloseKey(handle)
def test_getkeyinfo(self):
handle = self.conn.OpenHKLM(None,
winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
x = self.conn.QueryInfoKey(handle, winreg.String())
self.assertEquals(9, len(x)) # should return a 9-tuple
self.conn.CloseKey(handle)