rpms/pygobject2/devel Don-t-raise-an-error-in-_pygi_import-if-pygi-support-is-disabled.patch, NONE, 1.1 pygobject2.spec, 1.63, 1.64
Colin Walters
walters at fedoraproject.org
Mon May 24 14:38:21 UTC 2010
Author: walters
Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29155
Modified Files:
pygobject2.spec
Added Files:
Don-t-raise-an-error-in-_pygi_import-if-pygi-support-is-disabled.patch
Log Message:
* Mon May 24 2010 Colin Walters <walters at verbum.org> - 2.21.1-7
- Reenable pygi in preparation for getting it packaged
Don-t-raise-an-error-in-_pygi_import-if-pygi-support-is-disabled.patch:
pygboxed.c | 6 +-----
pygi-external.h | 1 -
pygobject.c | 6 +-----
pygpointer.c | 7 +------
4 files changed, 3 insertions(+), 17 deletions(-)
--- NEW FILE Don-t-raise-an-error-in-_pygi_import-if-pygi-support-is-disabled.patch ---
>From 23fc0f615d87994acafd9d39e92dd92b587fc2eb Mon Sep 17 00:00:00 2001
From: Simon van der Linden <svdlinden at src.gnome.org>
Date: Thu, 21 Jan 2010 17:30:51 +0100
Subject: [PATCH] Don't raise an error in _pygi_import if pygi support is disabled
http://bugzilla.gnome.org/show_bug.cgi?id=607674
---
gobject/pygboxed.c | 6 +-----
gobject/pygi-external.h | 1 -
gobject/pygobject.c | 6 +-----
gobject/pygpointer.c | 6 +-----
4 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/gobject/pygboxed.c b/gobject/pygboxed.c
index 1233b01..87695eb 100644
--- a/gobject/pygboxed.c
+++ b/gobject/pygboxed.c
@@ -185,12 +185,8 @@ pyg_boxed_new(GType boxed_type, gpointer boxed, gboolean copy_boxed,
tp = g_type_get_qdata(boxed_type, pygboxed_type_key);
- if (tp == NULL) {
+ if (!tp)
tp = (PyTypeObject *)pygi_type_import_by_g_type(boxed_type);
- if (tp == NULL) {
- PyErr_Clear();
- }
- }
if (!tp)
tp = (PyTypeObject *)&PyGBoxed_Type; /* fallback */
diff --git a/gobject/pygi-external.h b/gobject/pygi-external.h
index e0d11c2..aec2f25 100644
--- a/gobject/pygi-external.h
+++ b/gobject/pygi-external.h
@@ -49,7 +49,6 @@ _pygi_import (void)
return 0;
#else
- PyErr_SetString(PyExc_ImportError, "PyGI support not enabled");
return -1;
#endif /* ENABLE_PYGI */
}
diff --git a/gobject/pygobject.c b/gobject/pygobject.c
index 222280b..f8d7dd1 100644
--- a/gobject/pygobject.c
+++ b/gobject/pygobject.c
@@ -874,12 +874,8 @@ pygobject_lookup_class(GType gtype)
if (py_type == NULL) {
py_type = g_type_get_qdata(gtype, pyginterface_type_key);
- if (py_type == NULL) {
+ if (py_type == NULL)
py_type = (PyTypeObject *)pygi_type_import_by_g_type(gtype);
- if (py_type == NULL) {
- PyErr_Clear();
- }
- }
if (py_type == NULL) {
py_type = pygobject_new_with_interfaces(gtype);
diff --git a/gobject/pygpointer.c b/gobject/pygpointer.c
index 449b80c..5f6417f 100644
--- a/gobject/pygpointer.c
+++ b/gobject/pygpointer.c
@@ -159,12 +159,8 @@ pyg_pointer_new(GType pointer_type, gpointer pointer)
tp = g_type_get_qdata(pointer_type, pygpointer_class_key);
- if (tp == NULL) {
+ if (!tp)
tp = (PyTypeObject *)pygi_type_import_by_g_type(pointer_type);
- if (tp == NULL) {
- PyErr_Clear();
- }
- }
if (!tp)
tp = (PyTypeObject *)&PyGPointer_Type; /* fallback */
--
1.6.6.1
Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- pygobject2.spec 24 May 2010 14:37:45 -0000 1.63
+++ pygobject2.spec 24 May 2010 14:38:20 -0000 1.64
@@ -15,7 +15,7 @@
Name: pygobject2
Version: 2.21.1
-Release: 7%{?dist}
+Release: 8%{?dist}
License: LGPLv2+
Group: Development/Languages
Summary: Python bindings for GObject
More information about the scm-commits
mailing list