pidl: Remove reference to PyInt_Type from error string when we wanted a sensible...

PyInt_Type is no longer a thing in Python3, we will remove the compatability
reference shortly.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 6cd85d1a36ce32f2347bf1364597cc6eaf0f15e8..8eb50c8208b095411b4bd56f61bd606078b7f7d5 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -1747,8 +1747,8 @@ sub ConvertObjectFromPythonData($$$$$$;$$)
                $self->pidl("}");
                $self->pidl("if (test_var > uint_max) {");
                $self->indent;
-               $self->pidl("PyErr_Format(PyExc_OverflowError, \"Expected type %s or %s within range 0 - %llu, got %llu\",\\");
-               $self->pidl("  PyInt_Type.tp_name, PyLong_Type.tp_name, uint_max, test_var);");
+               $self->pidl("PyErr_Format(PyExc_OverflowError, \"Expected type %s within range 0 - %llu, got %llu\",\\");
+               $self->pidl("  PyLong_Type.tp_name, uint_max, test_var);");
                $self->pidl($fail);
                $self->deindent;
                $self->pidl("}");
@@ -1756,8 +1756,8 @@ sub ConvertObjectFromPythonData($$$$$$;$$)
                $self->deindent;
                $self->pidl("} else {");
                $self->indent;
-               $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type %s or %s\",\\");
-               $self->pidl("  PyInt_Type.tp_name, PyLong_Type.tp_name);");
+               $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type %s\",\\");
+               $self->pidl("  PyLong_Type.tp_name);");
                $self->pidl($fail);
                $self->deindent;
                $self->pidl("}");
@@ -1786,8 +1786,8 @@ sub ConvertObjectFromPythonData($$$$$$;$$)
                $self->pidl("}");
                $self->pidl("if (test_var < int_min || test_var > int_max) {");
                $self->indent;
-               $self->pidl("PyErr_Format(PyExc_OverflowError, \"Expected type %s or %s within range %lld - %lld, got %lld\",\\");
-               $self->pidl("  PyInt_Type.tp_name, PyLong_Type.tp_name, int_min, int_max, test_var);");
+               $self->pidl("PyErr_Format(PyExc_OverflowError, \"Expected type %s within range %lld - %lld, got %lld\",\\");
+               $self->pidl("  PyLong_Type.tp_name, int_min, int_max, test_var);");
                $self->pidl($fail);
                $self->deindent;
                $self->pidl("}");
@@ -1795,8 +1795,8 @@ sub ConvertObjectFromPythonData($$$$$$;$$)
                $self->deindent;
                $self->pidl("} else {");
                $self->indent;
-               $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type %s or %s\",\\");
-               $self->pidl("  PyInt_Type.tp_name, PyLong_Type.tp_name);");
+               $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type %s\",\\");
+               $self->pidl("  PyLong_Type.tp_name);");
                $self->pidl($fail);
                $self->deindent;
                $self->pidl("}");