diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-25 06:38:05 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-25 06:38:05 +0200 |
| commit | 521354e4b328af321ee223a77339bc045c074d18 (patch) | |
| tree | 12d452f761a386b07f067e19374d11ef6fad4793 /source4/libcli/util/errors.i | |
| parent | 1b5acdb93b2febab2d26862a1cd2c7614d558478 (diff) | |
| parent | 74126bc6d0211a7674156dfda8ab13054b403a1d (diff) | |
| download | samba-521354e4b328af321ee223a77339bc045c074d18.tar.gz samba-521354e4b328af321ee223a77339bc045c074d18.tar.bz2 samba-521354e4b328af321ee223a77339bc045c074d18.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-pyirpc
(This used to be commit 0a9330ee2a38bff13bf9af48114e6eecd962680b)
Diffstat (limited to 'source4/libcli/util/errors.i')
| -rw-r--r-- | source4/libcli/util/errors.i | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/libcli/util/errors.i b/source4/libcli/util/errors.i index 17efcbf62a..1fcde04c85 100644 --- a/source4/libcli/util/errors.i +++ b/source4/libcli/util/errors.i @@ -18,10 +18,13 @@ */ #ifdef SWIGPYTHON +%{ +#include "libcli/util/pyerrors.h" +%} + %typemap(out,noblock=1) WERROR { if (!W_ERROR_IS_OK($1)) { - PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V($1), win_errstr($1)); - PyErr_SetObject(PyExc_RuntimeError, obj); + PyErr_SetWERROR($1); SWIG_fail; } else if ($result == NULL) { $result = Py_None; @@ -30,8 +33,7 @@ %typemap(out,noblock=1) NTSTATUS { if (NT_STATUS_IS_ERR($1)) { - PyObject *obj = Py_BuildValue((char *)"(i,s)", NT_STATUS_V($1), nt_errstr($1)); - PyErr_SetObject(PyExc_RuntimeError, obj); + PyErr_SetNTSTATUS($1); SWIG_fail; } else if ($result == NULL) { $result = Py_None; |