Attachment 109034 Details for Bug 85969 – Use pygi instead of pygobject 2

[patch] Use pygi instead of pygobject 2

0001-Use-pygi-instead-of-pygobject-2.patch (text/plain), 3.22 KB, created by Simon McVittie on 2014-11-06 14:25:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-11-06 14:25:55 UTC

Size: 3.22 KB

patch

obsolete

>From 3c1e74463f6f77ca603cf3da24ff022de84288f1 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 6 Nov 2014 14:24:14 +0000
>Subject: [PATCH] Use pygi instead of pygobject 2
>
>pygobject 2 is obsolete and unmaintained, and anyway this is for
>optional functionality (full regression test coverage) rather than
>anything that will be needed in production builds.
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> configure.ac                              | 6 +++---
> test/name-test/test-activation-forking.py | 6 +++---
> test/name-test/test-wait-for-echo.py      | 6 +++---
> 3 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index ae2c01c..6a5a284 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -263,14 +263,14 @@ AM_CONDITIONAL([DBUS_ENABLE_INSTALLED_TESTS],
> 
> if test "x$enable_tests" = xyes; then
>   # full test coverage is required, Python is a hard dependency
>-  AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject])
>+  AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygi])
>   AM_PATH_PYTHON([2.6])
>   AC_MSG_CHECKING([for Python modules for full test coverage])
>-  if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then
>+  if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; then
>     AC_MSG_RESULT([yes])
>   else
>     AC_MSG_RESULT([no])
>-    AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules])
>+    AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, dbus.mainloop.glib Python modules])
>   fi
> else
>   # --enable-tests not given: do not abort if Python is missing
>diff --git a/test/name-test/test-activation-forking.py b/test/name-test/test-activation-forking.py
>index 0d82075..f98537e 100644
>--- a/test/name-test/test-activation-forking.py
>+++ b/test/name-test/test-activation-forking.py
>@@ -3,7 +3,7 @@
> import os,sys
> 
> try:
>-    import gobject
>+    from gi.repository import GObject
>     import dbus
>     import dbus.mainloop.glib
> except:
>@@ -11,7 +11,7 @@ except:
>     sys.exit(0)
> 
> dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
>-loop = gobject.MainLoop()
>+loop = GObject.MainLoop()
> 
> exitcode = 0
> 
>@@ -54,7 +54,7 @@ def check_counter():
>     if counter == 0:
>         print "Failed to get NameOwnerChanged for TestSuiteForkingEchoService"
>         sys.exit(1)
>-gobject.timeout_add(15000, check_counter)
>+GObject.timeout_add(15000, check_counter)
> 
> loop.run()
> sys.exit(0)
>diff --git a/test/name-test/test-wait-for-echo.py b/test/name-test/test-wait-for-echo.py
>index bd09e45..49ecbb4 100755
>--- a/test/name-test/test-wait-for-echo.py
>+++ b/test/name-test/test-wait-for-echo.py
>@@ -3,15 +3,15 @@
> import os,sys
> 
> try:
>-    import gobject
>     import dbus
>     import dbus.mainloop.glib
>+    from gi.repository import GObject
> except:
>     print "Failed import, aborting test"
>     sys.exit(0)
> 
> dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
>-loop = gobject.MainLoop()
>+loop = GObject.MainLoop()
> 
> exitcode = 0
> 
>@@ -21,7 +21,7 @@ def handle_noreceipt():
>     exitcode = 1
>     loop.quit()
> 
>-gobject.timeout_add(7000, handle_noreceipt)
>+GObject.timeout_add(7000, handle_noreceipt)
> 
> bus = dbus.SessionBus()
> 
>-- 
>2.1.3
>

Actions: View | Splinter Review

Attachments on bug 85969: 109034

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.