[pygobject] pygi-info: remove some dead code. Fixes #303
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] pygi-info: remove some dead code. Fixes #303
- Date: Sun, 24 Mar 2019 09:28:34 +0000 (UTC)
commit 7576e029916c835435ca8bf67b03d7fed9f759a0
Author: Christoph Reiter <reiter christoph gmail com>
Date: Sun Mar 24 10:27:06 2019 +0100
pygi-info: remove some dead code. Fixes #303
_pygi_g_registered_type_info_check_object() is never called with
is_instance=FALSE.
gi/pygi-info.c | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
---
diff --git a/gi/pygi-info.c b/gi/pygi-info.c
index 5508001f..94564ed7 100644
--- a/gi/pygi-info.c
+++ b/gi/pygi-info.c
@@ -1824,7 +1824,6 @@ out:
static gint
_pygi_g_registered_type_info_check_object (GIRegisteredTypeInfo *info,
- gboolean is_instance,
PyObject *object)
{
gint retval;
@@ -1854,24 +1853,10 @@ _pygi_g_registered_type_info_check_object (GIRegisteredTypeInfo *info,
g_assert (PyType_Check (py_type));
- if (is_instance) {
- retval = PyObject_IsInstance (object, py_type);
- if (!retval) {
- type_name_expected = _pygi_g_base_info_get_fullname (
- (GIBaseInfo *) info);
- }
- } else {
- if (!PyObject_Type (py_type)) {
- type_name_expected = "type";
- retval = 0;
- } else if (!PyType_IsSubtype ( (PyTypeObject *) object,
- (PyTypeObject *) py_type)) {
- type_name_expected = _pygi_g_base_info_get_fullname (
- (GIBaseInfo *) info);
- retval = 0;
- } else {
- retval = 1;
- }
+ retval = PyObject_IsInstance (object, py_type);
+ if (!retval) {
+ type_name_expected = _pygi_g_base_info_get_fullname (
+ (GIBaseInfo *) info);
}
Py_DECREF (py_type);
@@ -1920,7 +1905,7 @@ _wrap_g_field_info_get_value (PyGIBaseInfo *self,
g_assert (container_info != NULL);
/* Check the instance. */
- if (!_pygi_g_registered_type_info_check_object ( (GIRegisteredTypeInfo *) container_info, TRUE,
instance)) {
+ if (!_pygi_g_registered_type_info_check_object ( (GIRegisteredTypeInfo *) container_info, instance)) {
_PyGI_ERROR_PREFIX ("argument 1: ");
return NULL;
}
@@ -2028,7 +2013,7 @@ _wrap_g_field_info_set_value (PyGIBaseInfo *self,
g_assert (container_info != NULL);
/* Check the instance. */
- if (!_pygi_g_registered_type_info_check_object ( (GIRegisteredTypeInfo *) container_info, TRUE,
instance)) {
+ if (!_pygi_g_registered_type_info_check_object ( (GIRegisteredTypeInfo *) container_info, instance)) {
_PyGI_ERROR_PREFIX ("argument 1: ");
return NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]