python/pidl: Handle non-string types.

(This used to be commit 02dd02c529d578ad7fa4a6b825097685555604fe)

1 files changed, 19 insertions, 1 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 7c379548ed..5077102fc7 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -347,6 +347,24 @@ sub register_module_method($$$$$)
 	push (@{$self->{module_methods}}, [$fn_name, $pyfn_name, $flags, $doc])
 }
 
+sub ConvertObjectToPython($$$)
+{
+	my ($self, $ctype, $cvar) = @_;
+
+	if ($cvar =~ /^".*"$/) {
+		return "PyString_FromString($cvar)";
+	}
+
+	if ($cvar =~ /^[0-9]+$/ or 
+		$ctype->{TYPE} eq "ENUM" or $ctype->{TYPE} eq "BITMAP" or 
+		$ctype->{TYPE} eq "TYPEDEF" and 
+		($ctype->{TYPE} eq "ENUM" or $ctype->{TYPE} eq "BITMAP")) {
+		return "PyInt_FromLong($cvar)";
+	}
+
+	die("Unknown type for ".mapTypeName($ctype).": $cvar");
+}
+
 sub Parse($$$$)
 {
     my($self,$basename,$ndr,$hdr) = @_;
@@ -391,7 +409,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("}");