pidl/python: Use new talloc utility functions.
[ira/wip.git] / source / pidl / lib / Parse / Pidl / Samba4 / Python.pm
index 8effff9d5e9f08cc8ef4209c069ffe5eceb9c409..4b552a9ba9dc59acf041e0f3ad547d2c4ffa78b0 100644 (file)
@@ -1,6 +1,6 @@
 ###################################################
 # Python function wrapper generator
-# Copyright jelmer@samba.org 2007
+# Copyright jelmer@samba.org 2007-2008
 # released under the GNU GPL
 
 package Parse::Pidl::Samba4::Python;
@@ -9,15 +9,17 @@ use Exporter;
 @ISA = qw(Exporter);
 
 use strict;
-use Parse::Pidl::Typelist;
+use Parse::Pidl::Typelist qw(hasType getType mapTypeName expandAlias);
 use Parse::Pidl::Util qw(has_property ParseExpr);
+use Parse::Pidl::CUtil qw(get_value_of get_pointer_to);
 
 use vars qw($VERSION);
 $VERSION = '0.01';
 
 sub new($) {
        my ($class) = @_;
-       my $self = { res => "", res_hdr => "", tabs => "", constants => {}};
+       my $self = { res => "", res_hdr => "", tabs => "", constants => {},
+                    module_methods => []};
        bless($self, $class);
 }
 
@@ -63,85 +65,147 @@ sub Import
 sub Const($$)
 {
     my ($self, $const) = @_;
-    $self->{constants}->{$const->{NAME}} = [$const->{DATA}->{TYPE}, $const->{VALUE}];
+       $self->register_constant($const->{NAME}, $const->{DTYPE}, $const->{VALUE});
 }
 
-sub FromTypeToPythonFunction($$)
+sub register_constant($$$$)
 {
-       my ($self, $type) = @_;
+       my ($self, $name, $type, $value) = @_;
 
-       #FIXME
+       $self->{constants}->{$name} = [$type, $value];
 }
 
-sub FromPythonToTypeFunction($$)
+sub EnumAndBitmapConsts($$$)
 {
-       my ($self, $type) = @_;
+       my ($self, $name, $d) = @_;
 
-       #FIXME
+       return unless (defined($d->{ELEMENTS}));
+
+       foreach my $e (@{$d->{ELEMENTS}}) {
+               $e =~ /^([A-Za-z0-9_]+)=(.*)$/;
+               my $cname = $1;
+               
+               $self->register_constant($cname, $d, $cname);
+       }
 }
 
-sub TypeConstructor($$)
+sub FromUnionToPythonFunction($$$)
 {
-       my ($self, $type) = @_;
+       my ($self, $type, $switch, $name) = @_;
 
-       $self->pidl("staticforward PyTypeObject $type->{NAME}_ObjectType;");
-       $self->pidl("typedef struct {");
+       $self->pidl("switch ($switch) {");
        $self->indent;
-       $self->pidl("PyObject_HEAD");
-       $self->pidl("void *object;"); # FIXME: Use real type rather than void
+
+       foreach my $e (@{$type->{ELEMENTS}}) {
+               my $conv = $self->ConvertObjectToPython($e->{TYPE}, "$name->$e->{NAME}");
+               if (defined($e->{CASE})) {
+                       $self->pidl("$e->{CASE}: return $conv;");
+               } else {
+                       $self->pidl("default: return $conv;");
+               }
+       }
+
        $self->deindent;
-       $self->pidl("} $type->{NAME}_Object;");
+       $self->pidl("}");
 
-       $self->pidl("");
+       $self->pidl("PyErr_SetString(PyExc_TypeError, \"unknown union level\");");
+       $self->pidl("return NULL;");
+}
 
-       $self->pidl("static PyObject *py_$type->{NAME}_getattr(PyTypeObject *obj, char *name)");
-       $self->pidl("{");
+sub FromPythonToUnionFunction($$$$)
+{
+       my ($self, $type, $switch, $mem_ctx, $name) = @_;
+
+       $self->pidl("switch ($switch) {");
        $self->indent;
-       $self->pidl("return Py_None;");
+
+       foreach my $e (@{$type->{ELEMENTS}}) {
+               my $conv = $self->ConvertObjectFromPython($e->{TYPE}, "$name");
+               if (defined($e->{CASE})) {
+                       $self->pidl("$e->{CASE}: return $conv;");
+               } else {
+                       $self->pidl("default: return $conv;");
+               }
+       }
+
        $self->deindent;
        $self->pidl("}");
+       $self->pidl("");
+       $self->pidl("PyErr_SetString(PyExc_TypeError, \"invalid union level value\");");
+       $self->pidl("return NULL;");
+}
+
+sub PythonStruct($$$$)
+{
+       my ($self, $name, $cname, $d) = @_;
+
+       $self->pidl("staticforward PyTypeObject $name\_ObjectType;");
+
        $self->pidl("");
 
-       $self->pidl("static void py_$type->{NAME}_dealloc(PyObject* self)");
+       $self->pidl("static PyObject *py_$name\_getattr(PyTypeObject *obj, char *name)");
        $self->pidl("{");
        $self->indent;
-       $self->pidl("$type->{NAME}_Object *obj = ($type->{NAME}_Object *)self;");
-       $self->pidl("talloc_free(obj->object);");
-       $self->pidl("PyObject_Del(self);");
+       $self->pidl("py_talloc_Object *py_object = (py_talloc_Object *)obj;");
+       $self->pidl("$cname *object = py_talloc_get_type(py_object, $cname);");
+       foreach my $e (@{$d->{ELEMENTS}}) {
+               $self->pidl("if (!strcmp(name, \"$e->{NAME}\")) {");
+               my $varname = "object->$e->{NAME}";
+               $self->indent;
+               $self->pidl("return ".$self->ConvertObjectToPython($e->{TYPE}, $varname) . ";");
+               $self->deindent;
+               $self->pidl("}");
+       }
+       $self->pidl("PyErr_SetString(PyExc_AttributeError, \"no such attribute\");");
+       $self->pidl("return NULL;");
        $self->deindent;
        $self->pidl("}");
        $self->pidl("");
 
-       $self->pidl("static PyObject *py_$type->{NAME}_setattr(PyTypeObject *obj, char *name, PyObject *value)");
+       $self->pidl("static PyObject *py_$name\_setattr(PyTypeObject *obj, char *name, PyObject *value)");
        $self->pidl("{");
        $self->indent;
-       $self->pidl("return Py_None;");
+       $self->pidl("py_talloc_Object *py_object = (py_talloc_Object *)obj;");
+       $self->pidl("$cname *object = py_talloc_get_type(py_object, $cname);");
+       foreach my $e (@{$d->{ELEMENTS}}) {
+               $self->pidl("if (!strcmp(name, \"$e->{NAME}\")) {");
+               my $varname = "object->$e->{NAME}";
+               $self->indent;
+               $self->pidl("/* FIXME: talloc_free($varname) if necessary */");
+               $self->pidl("$varname = " . $self->ConvertObjectFromPython($e->{TYPE}, "value") . ";");
+               $self->deindent;
+               $self->pidl("}");
+       }
+       $self->pidl("PyErr_SetString(PyExc_AttributeError, \"no such attribute\");");
+       $self->pidl("return NULL;");
        $self->deindent;
        $self->pidl("}");
        $self->pidl("");
 
-       $self->pidl("static PyTypeObject $type->{NAME}_ObjectType = {");
+       $self->pidl("static PyTypeObject $name\_ObjectType = {");
        $self->indent;
        $self->pidl("PyObject_HEAD_INIT(NULL) 0,");
-       $self->pidl(".tp_name = \"$type->{NAME}\",");
-       $self->pidl(".tp_basicsize = sizeof($type->{NAME}_Object),");
-       $self->pidl(".tp_dealloc = (destructor)py_$type->{NAME}_dealloc,");
-       $self->pidl(".tp_getattr = (getattrfunc)py_$type->{NAME}_getattr,");
-       $self->pidl(".tp_setattr = (setattrfunc)py_$type->{NAME}_setattr,");
+       $self->pidl(".tp_name = \"$name\",");
+       $self->pidl(".tp_basicsize = sizeof(py_talloc_Object),");
+       $self->pidl(".tp_dealloc = (destructor)py_talloc_dealloc,");
+       $self->pidl(".tp_getattr = (getattrfunc)py_$name\_getattr,");
+       $self->pidl(".tp_setattr = (setattrfunc)py_$name\_setattr,");
        $self->deindent;
        $self->pidl("};");
 
        $self->pidl("");
 
-       $self->pidl("static PyObject *py_$type->{NAME}(PyObject *self, PyObject *args)");
+       my $py_fnname = "py_$name";
+       $self->pidl("static PyObject *$py_fnname(PyObject *self, PyObject *args)");
        $self->pidl("{");
        $self->indent;
-       $self->pidl("$type->{NAME}\_Object *ret;");
-       $self->pidl("ret = PyObject_New($type->{NAME}_Object, &$type->{NAME}_ObjectType);");
-       $self->pidl("return (PyObject *) ret;");
+       $self->pidl("$cname *ret = talloc_zero(NULL, $cname);");
+       $self->pidl("return py_talloc_import(&$name\_ObjectType, ret);");
        $self->deindent;
        $self->pidl("}");
        $self->pidl("");
+
+       return $py_fnname;
 }
 
 sub PythonFunction($$$)
@@ -153,31 +217,127 @@ sub PythonFunction($$$)
        $self->indent;
        $self->pidl("$iface\_InterfaceObject *iface = ($iface\_InterfaceObject *)self;");
        $self->pidl("NTSTATUS status;");
-       $self->pidl("");
-       # FIXME
-       $self->handle_ntstatus("status", "NULL");
-       $self->pidl("return Py_None;");
+       $self->pidl("TALLOC_CTX *mem_ctx = talloc_new(NULL);");
+       $self->pidl("struct $fn->{NAME} r;");
+       $self->pidl("PyObject *result;");
+       my $result_size = 0;
+
+       foreach my $e (@{$fn->{ELEMENTS}}) {
+               if (grep(/in/,@{$e->{DIRECTION}})) {
+                       $self->pidl("PyObject *py_$e->{NAME};");
+               }
+               if (grep(/out/,@{$e->{DIRECTION}})) {
+                       $result_size++;
+               }
+       }
+       if ($result_size > 0) {
+               $self->pidl("");
+               $self->pidl("ZERO_STRUCT(r.out);");
+       }
+       if ($fn->{RETURN_TYPE}) {
+               $result_size++;
+       }
+
+       foreach my $e (@{$fn->{ELEMENTS}}) {
+               if (grep(/in/,@{$e->{DIRECTION}})) {
+                       $self->pidl("r.in.$e->{NAME} = " . $self->ConvertObjectFromPython($e->{TYPE}, "py_$e->{NAME}") . ";");
+               }
+       }
+       $self->pidl("status = dcerpc_$fn->{NAME}(iface->pipe, mem_ctx, &r);");
+       $self->handle_ntstatus("status", "NULL", "mem_ctx");
+
+       $self->pidl("result = PyTuple_New($result_size);");
+
+       my $i = 0;
+
+       foreach my $e (@{$fn->{ELEMENTS}}) {
+               if (grep(/out/,@{$e->{DIRECTION}})) {
+                       $self->pidl("PyTuple_SetItem(result, $i, " . $self->ConvertObjectToPython($e->{TYPE}, "r.out.$e->{NAME}") . ");");
+
+                       $i++;
+               }
+       }
+
+       if (defined($fn->{RETURN_TYPE})) {
+               $self->pidl("PyTuple_SetItem(result, $i, " . $self->ConvertObjectToPython($fn->{RETURN_TYPE}, "r.out.result") . ");");
+       }
+
+       $self->pidl("talloc_free(mem_ctx);");
+       $self->pidl("return result;");
        $self->deindent;
        $self->pidl("}");
        $self->pidl("");
 }
 
-sub handle_ntstatus($$$)
+sub handle_ntstatus($$$$)
 {
-       my ($self, $var, $retval) = @_;
+       my ($self, $var, $retval, $mem_ctx) = @_;
 
        $self->pidl("if (NT_STATUS_IS_ERR($var)) {");
        $self->indent;
        $self->pidl("PyErr_SetString(PyExc_RuntimeError, nt_errstr($var));");
+       $self->pidl("talloc_free($mem_ctx);") if ($mem_ctx);
        $self->pidl("return $retval;");
        $self->deindent;
        $self->pidl("}");
        $self->pidl("");
 }
 
-sub Interface($$)
+sub PythonType($$$)
 {
-       my($self,$interface) = @_;
+       my ($self, $d, $interface, $basename) = @_;
+
+       my $actual_ctype = $d;
+       if ($actual_ctype->{TYPE} eq "TYPEDEF") {
+               $actual_ctype = $actual_ctype->{DATA};
+       }
+
+       if ($actual_ctype->{TYPE} eq "STRUCT") {
+               my $py_fnname;
+               if ($d->{TYPE} eq "STRUCT") {
+                       $py_fnname = $self->PythonStruct($d->{NAME}, mapTypeName($d), $d);
+               } else {
+                       $py_fnname = $self->PythonStruct($d->{NAME}, mapTypeName($d), $d->{DATA});
+               }
+
+               my $fn_name = $d->{NAME};
+
+               $fn_name =~ s/^$interface->{NAME}_//;
+               $fn_name =~ s/^$basename\_//;
+
+               $self->register_module_method($fn_name, $py_fnname, "METH_VARARGS|METH_KEYWORDS", "NULL");
+       }
+
+       if ($d->{TYPE} eq "ENUM" or $d->{TYPE} eq "BITMAP") {
+               $self->EnumAndBitmapConsts($d->{NAME}, $d);
+       }
+
+       if ($d->{TYPE} eq "TYPEDEF" and ($d->{DATA}->{TYPE} eq "ENUM" or $d->{DATA}->{TYPE} eq "BITMAP")) {
+               $self->EnumAndBitmapConsts($d->{NAME}, $d->{DATA});
+       }
+
+       if ($actual_ctype->{TYPE} eq "UNION") {
+               $self->pidl("PyObject *py_import_$d->{NAME}(" .mapTypeName($d) . " *in)");
+               $self->pidl("{");
+               $self->indent;
+               $self->FromUnionToPythonFunction($actual_ctype, "level", "in") if ($actual_ctype->{TYPE} eq "UNION");
+               $self->deindent;
+               $self->pidl("}");
+               $self->pidl("");
+
+               $self->pidl(mapTypeName($d) . " *py_export_$d->{NAME}(TALLOC_CTX *mem_ctx, PyObject *in)");
+               $self->pidl("{");
+               $self->indent;
+               $self->FromPythonToUnionFunction($actual_ctype, "level", "mem_ctx", "in") if ($actual_ctype->{TYPE} eq "UNION");
+               $self->deindent;
+               $self->pidl("}");
+               $self->pidl("");
+       }
+}
+
+sub Interface($$$)
+{
+       my($self,$interface,$basename) = @_;
 
        $self->pidl_hdr("#ifndef _HEADER_PYTHON_$interface->{NAME}\n");
        $self->pidl_hdr("#define _HEADER_PYTHON_$interface->{NAME}\n\n");
@@ -186,10 +346,10 @@ sub Interface($$)
 
        $self->Const($_) foreach (@{$interface->{CONSTS}});
 
-       foreach (@{$interface->{TYPES}}) {
-               $self->FromTypeToPythonFunction($_);    
-               $self->FromPythonToTypeFunction($_);    
-               $self->TypeConstructor($_);
+       foreach my $d (@{$interface->{TYPES}}) {
+               next if has_property($d, "nopython");
+
+               $self->PythonType($d, $interface, $basename);
        }
 
        $self->pidl("staticforward PyTypeObject $interface->{NAME}_InterfaceType;");
@@ -250,13 +410,14 @@ sub Interface($$)
        $self->pidl("PyObject_HEAD_INIT(NULL) 0,");
        $self->pidl(".tp_name = \"$interface->{NAME}\",");
        $self->pidl(".tp_basicsize = sizeof($interface->{NAME}_InterfaceObject),");
-       $self->pidl(".tp_dealloc = interface_$interface->{NAME}_dealloc,");
-       $self->pidl(".tp_getattr = interface_$interface->{NAME}_getattr,");
+       $self->pidl(".tp_dealloc = (destructor)interface_$interface->{NAME}_dealloc,");
+       $self->pidl(".tp_getattr = (getattrfunc)interface_$interface->{NAME}_getattr,");
        $self->deindent;
        $self->pidl("};");
 
        $self->pidl("");
 
+       $self->register_module_method($interface->{NAME}, "interface_$interface->{NAME}", "METH_VARARGS|METH_KEYWORDS", "NULL");
        $self->pidl("static PyObject *interface_$interface->{NAME}(PyObject *self, PyObject *args)");
        $self->pidl("{");
        $self->indent;
@@ -264,6 +425,7 @@ sub Interface($$)
        $self->pidl("const char *binding_string;");
        $self->pidl("struct cli_credentials *credentials;");
        $self->pidl("struct loadparm_context *lp_ctx;");
+       $self->pidl("TALLOC_CTX *mem_ctx = NULL;");
        $self->pidl("NTSTATUS status;");
        $self->pidl("");
 
@@ -273,7 +435,7 @@ sub Interface($$)
 
        $self->pidl("status = dcerpc_pipe_connect(NULL, &ret->pipe, binding_string, ");
        $self->pidl("             &ndr_table_$interface->{NAME}, credentials, NULL, lp_ctx);");
-       $self->handle_ntstatus("status", "NULL");
+       $self->handle_ntstatus("status", "NULL", "mem_ctx");
 
        $self->pidl("return (PyObject *)ret;");
        $self->deindent;
@@ -285,9 +447,136 @@ sub Interface($$)
        $self->pidl_hdr("#endif /* _HEADER_NDR_$interface->{NAME} */\n");
 }
 
-sub Parse($$$$)
+sub register_module_method($$$$$)
+{
+       my ($self, $fn_name, $pyfn_name, $flags, $doc) = @_;
+
+       push (@{$self->{module_methods}}, [$fn_name, $pyfn_name, $flags, $doc])
+}
+
+sub ConvertObjectFromPython($$$)
+{
+       my ($self, $ctype, $cvar) = @_;
+
+       die("undef type for $cvar") unless(defined($ctype));
+
+       if (ref($ctype) ne "HASH") {
+               $ctype = getType($ctype);
+       }
+
+       if (ref($ctype) ne "HASH") {
+               return "FIXME($cvar)";
+       }
+
+       my $actual_ctype = $ctype;
+       if ($ctype->{TYPE} eq "TYPEDEF") {
+               $actual_ctype = $ctype->{DATA};
+       }
+
+       if ($actual_ctype->{TYPE} eq "ENUM" or $actual_ctype->{TYPE} eq "BITMAP" or 
+               $actual_ctype->{TYPE} eq "SCALAR" and (
+               expandAlias($actual_ctype->{NAME}) =~ /^(uint[0-9]+|hyper|NTTIME|time_t|NTTIME_hyper|NTTIME_1sec|dlong|udlong)$/)) {
+               return "PyInt_AsLong($cvar)";
+       }
+
+       if ($actual_ctype->{TYPE} eq "STRUCT") {
+               return "py_talloc_get_type($cvar, " . mapTypeName($ctype) . ")";
+       }
+
+       if ($actual_ctype->{TYPE} eq "UNION") {
+               return "py_export_$ctype->{NAME}($cvar)";
+       }
+
+       return "FIXME($cvar)";
+}
+
+sub ConvertObjectToPython($$$)
+{
+       my ($self, $ctype, $cvar) = @_;
+
+       if ($cvar =~ /^[0-9]+$/ or $cvar =~ /^0x[0-9a-fA-F]+$/) {
+               return "PyInt_FromLong($cvar)";
+       }
+
+       die("undef type for $cvar") unless(defined($ctype));
+
+       if ($cvar =~ /^".*"$/) {
+               return "PyString_FromString($cvar)";
+       }
+
+       if (ref($ctype) ne "HASH") {
+               if (not hasType($ctype)) {
+                       if (ref($ctype) eq "HASH") {
+                               return "py_import_$ctype->{TYPE}_$ctype->{NAME}($cvar)";
+                       } else {
+                               return "py_import_$ctype($cvar)"; # best bet
+                       }
+               }
+
+               $ctype = getType($ctype);
+       }
+
+       my $actual_ctype = $ctype;
+       if ($ctype->{TYPE} eq "TYPEDEF") {
+               $actual_ctype = $ctype->{DATA};
+       }
+
+       if ($actual_ctype->{TYPE} eq "ENUM" or $actual_ctype->{TYPE} eq "BITMAP" or 
+               ($actual_ctype->{TYPE} eq "SCALAR" and 
+               expandAlias($actual_ctype->{NAME}) =~ /^(int|long|char|u?int[0-9]+|hyper|dlong|udlong|udlongr|time_t|NTTIME_hyper|NTTIME|NTTIME_1sec)$/)) {
+               return "PyInt_FromLong($cvar)";
+       }
+
+       if ($ctype->{TYPE} eq "TYPEDEF" and $actual_ctype->{TYPE} eq "UNION") {
+               return "py_import_$ctype->{NAME}($cvar)";
+       }
+
+       if ($ctype->{TYPE} eq "TYPEDEF" and $actual_ctype->{TYPE} eq "STRUCT") {
+               # FIXME: if $cvar is not a pointer, do a talloc_dup()
+               return "py_talloc_import(&$ctype->{NAME}_ObjectType, $cvar)";
+       }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and 
+               expandAlias($actual_ctype->{NAME}) eq "DATA_BLOB") {
+               return "PyString_FromStringAndSize($cvar->data, $cvar->length)";
+       }
+
+       if ($ctype->{TYPE} eq "STRUCT" or $ctype->{TYPE} eq "UNION") {
+               return "py_import_$ctype->{TYPE}_$ctype->{NAME}($cvar)";
+       }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "NTSTATUS") {
+               return "PyInt_FromLong($cvar->v)";
+       }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "WERROR") {
+               return "PyInt_FromLong($cvar->v)";
+       }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and 
+               ($actual_ctype->{NAME} eq "string" or $actual_ctype->{NAME} eq "nbt_string" or $actual_ctype->{NAME} eq "nbt_name" or $actual_ctype->{NAME} eq "wrepl_nbt_name")) {
+               return "PyString_FromString($cvar)";
+       }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "string_array") {
+               return "FIXME($cvar)";
+       }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "ipv4address") {
+               return "FIXME($cvar)";
+               }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "pointer") {
+               return "PyCObject_FromVoidPtr($cvar, talloc_free)";
+       }
+
+
+       die("unknown type ".mapTypeName($ctype) . ": $cvar");
+}
+
+sub Parse($$$$$)
 {
-    my($self,$basename,$ndr,$hdr) = @_;
+    my($self,$basename,$ndr,$ndr_hdr,$hdr) = @_;
     
     my $py_hdr = $hdr;
     $py_hdr =~ s/ndr_([^\/]+)$/py_$1/g;
@@ -299,33 +588,23 @@ sub Parse($$$$)
 #include \"includes.h\"
 #include <Python.h>
 #include \"librpc/rpc/dcerpc.h\"
+#include \"scripting/python/pytalloc.h\"
 #include \"$hdr\"
+#include \"$ndr_hdr\"
 #include \"$py_hdr\"
 
 ");
 
        foreach my $x (@$ndr) {
-           ($x->{TYPE} eq "INTERFACE") && $self->Interface($x);
+           ($x->{TYPE} eq "INTERFACE") && $self->Interface($x, $basename);
                ($x->{TYPE} eq "IMPORT") && $self->Import(@{$x->{PATHS}});
        }
        
        $self->pidl("static PyMethodDef $basename\_methods[] = {");
        $self->indent;
-       foreach my $x (@$ndr) {
-           next if ($x->{TYPE} ne "INTERFACE");
-               $self->pidl("{ \"$x->{NAME}\", (PyCFunction)interface_$x->{NAME}, METH_VARARGS|METH_KEYWORDS, NULL },");
-
-               foreach my $d (@{$x->{TYPES}}) {
-                       next if has_property($d, "nopython");
-                       next if ($d->{TYPE} eq "ENUM" or $d->{TYPE} eq "BITMAP");
-
-                       my $fn_name = $d->{NAME};
-
-                       $fn_name =~ s/^$x->{NAME}_//;
-                       $fn_name =~ s/^$basename\_//;
-
-                       $self->pidl("{ \"$fn_name\", (PyCFunction)py_$d->{NAME}, METH_VARARGS|METH_KEYWORDS, NULL },");
-               }
+       foreach (@{$self->{module_methods}}) {
+               my ($fn_name, $pyfn_name, $flags, $doc) = @$_;
+               $self->pidl("{ \"$fn_name\", (PyCFunction)$pyfn_name, $flags, $doc },");
        }
        
        $self->pidl("{ NULL, NULL, 0, NULL }");
@@ -341,7 +620,7 @@ sub Parse($$$$)
        $self->pidl("m = Py_InitModule(\"$basename\", $basename\_methods);");
        foreach (keys %{$self->{constants}}) {
                # FIXME: Handle non-string constants
-               $self->pidl("PyModule_AddObject(m, \"$_\", PyString_FromString(" . $self->{constants}->{$_}->[1] . "));");
+               $self->pidl("PyModule_AddObject(m, \"$_\", " .  $self->ConvertObjectToPython($self->{constants}->{$_}->[0], $self->{constants}->{$_}->[1]) . ");");
        }
        $self->deindent;
        $self->pidl("}");