summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-21 00:11:50 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-21 00:11:50 +0100
commit40510348299e3b7b5bcebdb39072f2a44316c806 (patch)
treefda159a1b6408c0c41e362700cc09a10255c7dc5
parent13fa639a29a3e79d825a9b75ac507285e39ff364 (diff)
parent42b7762f9b69b543038ad1bb754e3d9a813704db (diff)
downloadsamba-40510348299e3b7b5bcebdb39072f2a44316c806.tar.gz
samba-40510348299e3b7b5bcebdb39072f2a44316c806.tar.bz2
samba-40510348299e3b7b5bcebdb39072f2a44316c806.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
-rw-r--r--pidl/lib/Parse/Pidl/Samba4/Python.pm7
1 files changed, 2 insertions, 5 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 4c598b3ca0..15dbd67b7c 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -221,14 +221,11 @@ sub PythonStruct($$$$$$)
$self->pidl("");
}
- $self->pidl("static PyObject *py_$name\_new(PyTypeObject *self, PyObject *args, PyObject *kwargs)");
+ $self->pidl("static PyObject *py_$name\_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)");
$self->pidl("{");
$self->indent;
- $self->pidl("char *kwlist[] = {NULL};");
$self->pidl("$cname *ret = talloc_zero(NULL, $cname);");
- $self->pidl("if (!PyArg_ParseTupleAndKeywords(args, kwargs, \"\", kwlist))");
- $self->pidl("\treturn NULL;");
- $self->pidl("return py_talloc_import(&$name\_Type, ret);");
+ $self->pidl("return py_talloc_import(type, ret);");
$self->deindent;
$self->pidl("}");
$self->pidl("");