diff options
author | Barry Warsaw <barry@python.org> | 2011-12-17 12:09:57 -0500 |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2011-12-17 12:09:57 -0500 |
commit | 9201d65b31305c8bef86ab072b7c33b197ede562 (patch) | |
tree | facdf4d06018a41237ae6fa53bb130387d46af47 | |
parent | f8dab5af0bef5d26a51df41a564a5285c16a9cb5 (diff) | |
download | dbus-python-9201d65b31305c8bef86ab072b7c33b197ede562.tar.gz |
Quash a few more deprecations.
-rw-r--r-- | test/test-p2p.py | 10 | ||||
-rw-r--r-- | test/test-signals.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/test-p2p.py b/test/test-p2p.py index fed56d7..772c4ba 100644 --- a/test/test-p2p.py +++ b/test/test-p2p.py @@ -64,22 +64,22 @@ class TestDBusBindings(unittest.TestCase): 'org.freedesktop.DBus', 'Hello', '', (), **kwargs) if is_py2: - self.assert_(unique.__class__ == dbus.UTF8String, repr(unique)) - self.assert_(unique.startswith(':'), unique) + self.assertTrue(unique.__class__ == dbus.UTF8String, repr(unique)) + self.assertTrue(unique.startswith(':'), unique) conn.set_unique_name(unique) return conn, unique def testCall(self): conn, unique = self.get_conn_and_unique() ret = conn.call_blocking(NAME, OBJECT, IFACE, 'Echo', 'v', ('V',)) - self.assertEquals(ret, 'V') + self.assertEqual(ret, 'V') def testCallThroughProxy(self): conn, unique = self.get_conn_and_unique() proxy = conn.get_object(NAME, OBJECT) iface = dbus.Interface(proxy, IFACE) ret = iface.Echo('V') - self.assertEquals(ret, 'V') + self.assertEqual(ret, 'V') def testSetUniqueName(self): conn, unique = self.get_conn_and_unique() @@ -89,7 +89,7 @@ class TestDBusBindings(unittest.TestCase): ret = conn.call_blocking(NAME, OBJECT, IFACE, 'MethodExtraInfoKeywords', '', (), **kwargs) - self.assertEquals(ret, (unique, OBJECT, NAME, + self.assertEqual(ret, (unique, OBJECT, NAME, 'dbus.lowlevel.MethodCallMessage')) diff --git a/test/test-signals.py b/test/test-signals.py index 04b1e53..3dab2ce 100644 --- a/test/test-signals.py +++ b/test/test-signals.py @@ -34,9 +34,9 @@ pydir = os.path.normpath(os.environ["DBUS_TOP_SRCDIR"]) import dbus import _dbus_bindings -import gobject import dbus.glib import dbus.service +from gi.repository import GObject as gobject logging.basicConfig() |