Renamed basic methods of dbus objects to use dbus_ prefix

docs/asyncio_api.rst

@@ -26,24 +26,25 @@ Classes
         for interfaces that sd-bus already provides such as
         ``org.freedesktop.DBus.Peer``.
 
-    .. py:method:: ping()
+    .. py:method:: dbus_ping()
         :async:
 
         Pings the remote object using dbus.
         Usefull to test if remote object is alive.
 
-    .. py:method:: get_machine_id()
+    .. py:method:: dbus_machine_id()
         :async:
 
         Returns the machine UUID of the remote object.
 
         :return: machine UUID
         :rtype: str
 
-    .. py:method:: introspect()
+    .. py:method:: dbus_introspect()
         :async:
 
         Get dbus introspection XML.
+
         It is users responsibility to parse that data.
 
         :return: string with introspection XML

docs/sync_api.rst

@@ -34,21 +34,23 @@ Classes
             Optional dbus connection object.
             If not passed the default dbus will be used.
 
-    .. py:method:: ping()
+    .. py:method:: dbus_ping()
     
         Pings the remote object using dbus.
+
         Usefull to test if remote object is alive.
 
-    .. py:method:: get_machine_id()
+    .. py:method:: dbus_machine_id()
     
         Returns the machine UUID of the remote object.
-        
+
         :return: machine UUID
         :rtype: str
 
-    .. py:method:: introspect()
+    .. py:method:: dbus_introspect()
 
         Get dbus introspection XML.
+
         It is users responsibility to parse that data.
 
         :return: string with introspection XML

sdbus/dbus_proxy_async.py

@@ -707,12 +707,12 @@ class DbusPeerInterfaceAsync(
     serving_enabled=False,
 ):
 
-    @dbus_method_async()
-    async def ping(self) -> None:
+    @dbus_method_async(method_name='Ping')
+    async def dbus_ping(self) -> None:
         raise NotImplementedError
 
-    @dbus_method_async()
-    async def get_machine_id(self) -> str:
+    @dbus_method_async(method_name='GetMachineId')
+    async def dbus_machine_id(self) -> str:
         raise NotImplementedError
 
 
@@ -722,8 +722,8 @@ class DbusIntrospectableAsync(
     serving_enabled=False,
 ):
 
-    @dbus_method_async()
-    async def introspect(self) -> str:
+    @dbus_method_async(method_name='Introspect')
+    async def dbus_introspect(self) -> str:
         raise NotImplementedError
 
 

sdbus/dbus_proxy_sync.py

@@ -292,12 +292,12 @@ class DbusPeerInterface(
     serving_enabled=False,
 ):
 
-    @dbus_method()
-    def ping(self) -> None:
+    @dbus_method(method_name='Ping')
+    def dbus_ping(self) -> None:
         raise NotImplementedError
 
-    @dbus_method()
-    def get_machine_id(self) -> str:
+    @dbus_method(method_name='GetMachineId')
+    def dbus_machine_id(self) -> str:
         raise NotImplementedError
 
 
@@ -307,8 +307,8 @@ class DbusIntrospectable(
     serving_enabled=False,
 ):
 
-    @dbus_method()
-    def introspect(self) -> str:
+    @dbus_method(method_name='Introspect')
+    def dbus_introspect(self) -> str:
         raise NotImplementedError
 
 

test/test_proxies.py

@@ -31,7 +31,9 @@ class TestFreedesktopDbus(TempDbusTest):
     async def test_connection(self) -> None:
         dbus_object = FreedesktopDbus(self.bus)
 
-        await dbus_object.ping()
+        await dbus_object.dbus_ping()
+        await dbus_object.dbus_introspect()
+        await dbus_object.dbus_machine_id()
         self.assertIsInstance(await dbus_object.get_id(), str)
         self.assertIsInstance(await dbus_object.features, list)
 

test/test_sd_bus_async.py

@@ -149,7 +149,7 @@ async def asyncSetUp(self) -> None:
         self.test_object_connection = TestInterface.new_connect(
             "org.example.test", '/', self.bus)
 
-        await self.test_object_connection.ping()
+        await self.test_object_connection.dbus_ping()
 
     async def test_method_kwargs(self) -> None:
 

test/test_sd_bus_sync.py

@@ -30,6 +30,9 @@ class TestSync(TestCase):
 
     def test_sync(self) -> None:
         s = FreedesktopDbus()
+        s.dbus_ping()
+        s.dbus_introspect()
+        s.dbus_machine_id()
 
         self.assertIsInstance(s.get_id(), str)
         self.assertIsInstance(s.features, list)