summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2017-11-30 19:50:25 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2017-11-30 19:50:25 (GMT)
commit23abef53590bf3dd6f88ff4dbe81e306abfa4386 (patch)
tree5e7178e9455d38e14f401f44b3074079e73ebf86 /plugins
parent7fd6e0b76f33de5934fad17efb75366904a3875b (diff)
Marked some arguments as optional for loading formats with Python.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/dex/python/format.c5
-rw-r--r--plugins/elf/python/format.c12
2 files changed, 15 insertions, 2 deletions
diff --git a/plugins/dex/python/format.c b/plugins/dex/python/format.c
index 74f6eae..906b09a 100644
--- a/plugins/dex/python/format.c
+++ b/plugins/dex/python/format.c
@@ -77,7 +77,10 @@ static PyObject *py_dex_format_new(PyTypeObject *type, PyObject *args, PyObject
GtkStatusStack *status; /* Instance GTK de suivi */
GBinFormat *format; /* Création GLib à transmettre */
- ret = PyArg_ParseTuple(args, "OOO", &content_obj, &parent_obj, &status_obj);
+ parent_obj = Py_None;
+ status_obj = Py_None;
+
+ ret = PyArg_ParseTuple(args, "O|OO", &content_obj, &parent_obj, &status_obj);
if (!ret) return NULL;
ret = PyObject_IsInstance(content_obj, (PyObject *)get_python_binary_content_type());
diff --git a/plugins/elf/python/format.c b/plugins/elf/python/format.c
index eb1bedb..a5e93d7 100644
--- a/plugins/elf/python/format.c
+++ b/plugins/elf/python/format.c
@@ -73,9 +73,19 @@ static PyObject *py_elf_format_new(PyTypeObject *type, PyObject *args, PyObject
GtkStatusStack *status; /* Instance GTK de suivi */
GBinFormat *format; /* Création GLib à transmettre */
- ret = PyArg_ParseTuple(args, "O!OO", get_python_binary_content_type(), &content_obj, &parent_obj, &status_obj);
+ parent_obj = Py_None;
+ status_obj = Py_None;
+
+ ret = PyArg_ParseTuple(args, "O|OO", &content_obj, &parent_obj, &status_obj);
if (!ret) return NULL;
+ ret = PyObject_IsInstance(content_obj, (PyObject *)get_python_binary_content_type());
+ if (!ret)
+ {
+ PyErr_SetString(PyExc_TypeError, _("The first argument must be an instance of BinContent."));
+ return NULL;
+ }
+
content = G_BIN_CONTENT(pygobject_get(content_obj));
if (parent_obj == Py_None)