test: glib call fixes in dbus tests

5 files changed, 17 insertions, 14 deletions

diff --git a/test/dbus/blacklist-test.py b/test/dbus/blacklist-test.py
index 5a216d2a..8e800bcc 100644
--- a/test/dbus/blacklist-test.py
+++ b/test/dbus/blacklist-test.py
@@ -27,12 +27,13 @@
 import sys
 import os
 import unittest
-import gobject
+import gi
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 from zeitgeist.client import ZeitgeistDBusInterface
 from zeitgeist.datamodel import *
 from testutils import RemoteTestCase, asyncTestMethod
+from gi.repository import GLib
 
 class BlacklistTest(RemoteTestCase):
 
@@ -309,7 +310,7 @@ class BlacklistTest(RemoteTestCase):
 		def launch_tests():
 			self.blacklist.AddTemplate("TestTemplate", template1)
 			self.blacklist.RemoveTemplate("TestTemplate")
-		gobject.idle_add(launch_tests)
+		GLib.idle_add(launch_tests)
 
 		mainloop.run()
 
diff --git a/test/dbus/dsr-test.py b/test/dbus/dsr-test.py
index 96f96b78..450f2b24 100644
--- a/test/dbus/dsr-test.py
+++ b/test/dbus/dsr-test.py
@@ -33,14 +33,15 @@ import time
 import tempfile
 import shutil
 import pickle
+import gi
 from subprocess import Popen, PIPE
 
 # DBus setup
-import gobject
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 from dbus.exceptions import DBusException
 
+from gi.repository import GLib
 from zeitgeist.datamodel import (Event, Subject, Interpretation, Manifestation,
 	TimeRange, StorageState, DataSource, NULL_EVENT, ResultType)
 
@@ -244,7 +245,7 @@ class ZeitgeistRemoteDataSourceRegistryTest(testutils.RemoteTestCase):
 		#self.client._registry.connect('DataSourceDisconnected', cb_disconnect)
 		
 		# Register data-source, disable it, enable it again
-		gobject.idle_add(self.testSetDataSourceEnabled)
+		GLib.idle_add(self.testSetDataSourceEnabled)
 		
 		mainloop.run()
 	
diff --git a/test/dbus/histogram-test.py b/test/dbus/histogram-test.py
index c31b06bb..10ce6644 100644
--- a/test/dbus/histogram-test.py
+++ b/test/dbus/histogram-test.py
@@ -26,7 +26,6 @@ import time
 import datetime
 import calendar
 import unittest
-import gobject
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 from zeitgeist.client import ZeitgeistDBusInterface
diff --git a/test/dbus/monitor-test.py b/test/dbus/monitor-test.py
index de0babef..9e5ab1ff 100644
--- a/test/dbus/monitor-test.py
+++ b/test/dbus/monitor-test.py
@@ -36,11 +36,12 @@ import pickle
 from subprocess import Popen, PIPE
 
 # DBus setup
-import gobject
+import gi
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 from dbus.exceptions import DBusException
 
+from gi.repository import GLib
 from zeitgeist.datamodel import (Event, Subject, Interpretation, Manifestation,
 	TimeRange, StorageState, DataSource, NULL_EVENT, ResultType)
 
@@ -217,7 +218,7 @@ class ZeitgeistMonitorTest(testutils.RemoteTestCase):
 		self.client.install_monitor(TimeRange(125, 145), [],
 			notify_insert_handler, notify_delete_handler)
 		
-		gobject.timeout_add_seconds(5, timeout)
+		GLib.timeout_add_seconds(5, timeout)
 		self.client.insert_events(events)
 		mainloop.run()
 	
@@ -309,7 +310,7 @@ class ZeitgeistMonitorTest(testutils.RemoteTestCase):
 		self.spawn_daemon()
 
 		# Insert events in idle loop to give the reconnection logic enough time
-		gobject.idle_add(lambda *args: self.client.insert_events(events))
+		GLib.idle_add(lambda *args: self.client.insert_events(events))
 
 		mainloop.run()
 		
diff --git a/test/dbus/testutils.py b/test/dbus/testutils.py
index 8d48db3b..479eee5d 100644
--- a/test/dbus/testutils.py
+++ b/test/dbus/testutils.py
@@ -29,10 +29,11 @@ import signal
 import tempfile
 import shutil
 import random
+import gi
 from subprocess import Popen, PIPE
 
 # DBus setup
-import gobject
+from gi.repository import GLib
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
@@ -76,7 +77,7 @@ def dict2event(d):
 	return ev
 	
 def parse_events(path):
-	data = json.load(file(path))
+	data = json.load(open(path))
 	events = list(map(dict2event, data))
 	return events
 
@@ -370,7 +371,7 @@ class RemoteTestCase (unittest.TestCase):
 			"""
 			
 			def __init__(self):
-				self._mainloop = gobject.MainLoop()
+				self._mainloop = GLib.MainLoop()
 				self.failed = False
 			
 			def __getattr__(self, name):
@@ -395,7 +396,7 @@ class RemoteTestCase (unittest.TestCase):
 				return False # stop timeout from being called again
 			
 			# Add an arbitrary timeout so this test won't block if it fails
-			gobject.timeout_add_seconds(timeout, cb_timeout)
+			GLib.timeout_add_seconds(timeout, cb_timeout)
 		
 		return mainloop
 	
@@ -435,7 +436,7 @@ class DBusPrivateMessageBus(object):
 
 	def _run(self):
 		os.environ.update({"DISPLAY": self.DISPLAY})
-		devnull = file("/dev/null", "w")
+		devnull = open("/dev/null", "w")
 		self.display = Popen(
 			["Xvfb", self.DISPLAY, "-screen", "0", "1024x768x8"],
 			stderr=devnull, stdout=devnull
@@ -447,7 +448,7 @@ class DBusPrivateMessageBus(object):
 			raise RuntimeError("Could not start Xvfb on display %s, got err=%i" %(self.DISPLAY, err))
 		dbus = Popen(["dbus-launch"], stdout=PIPE)
 		time.sleep(1)
-		self.dbus_config = dict(l.split("=", 1) for l in dbus.communicate()[0].split("\n") if l)
+		self.dbus_config = dict(l.split("=", 1) for l in dbus.communicate()[0].decode().split("\n") if l)
 		os.environ.update(self.dbus_config)
 		
 	def run(self, ignore_errors=False):