.gitignore

@@ -1 +1 @@
-SOURCES/dasbus-1.2.tar.gz
+SOURCES/dasbus-1.5.tar.gz

.python-dasbus.metadata

@@ -1 +1 @@
-2e4a97b5620f67a2575b54dd3d434b657a14c099 SOURCES/dasbus-1.2.tar.gz
+dabf4a6816e9d7b86a7c403a2605d6aaa53643e0 SOURCES/dasbus-1.5.tar.gz

SOURCES/0001-Fix-tests-for-handling-DBus-errors-on-the-server-sid.patch

@@ -1,64 +0,0 @@
-From 14c059135e305f85a579acd449f3a1c893558e55 Mon Sep 17 00:00:00 2001
-From: Vendula Poncova <vponcova@redhat.com>
-Date: Thu, 16 Jul 2020 21:28:18 +0200
-Subject: [PATCH 1/2] Fix tests for handling DBus errors on the server side
-
-Really check the name and the message of every returned DBus error.
----
- tests/test_server.py | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/tests/test_server.py b/tests/test_server.py
-index d96144e..ce91b97 100644
---- a/tests/test_server.py
-+++ b/tests/test_server.py
-@@ -94,7 +94,10 @@ class DBusServerTestCase(unittest.TestCase):
-                 parameters
-             )
- 
--        invocation.return_dbus_error(error_name, error_message)
-+        invocation.return_dbus_error.assert_called_once_with(
-+            error_name,
-+            error_message
-+        )
-         invocation.return_value.assert_not_called()
- 
-     def test_register(self):
-@@ -171,8 +174,8 @@ class DBusServerTestCase(unittest.TestCase):
-             "Interface",
-             "MethodInvalid",
-             error_name="not.known.Error.DBusSpecificationError",
--            error_message="Unknown member MethodInvalid of "
--                          "the interface Interface."
-+            error_message="DBus specification has no member "
-+                          "'Interface.MethodInvalid'."
-         )
- 
-         self.error_mapper.add_rule(ErrorRule(
-@@ -238,8 +241,9 @@ class DBusServerTestCase(unittest.TestCase):
-                 "Property2",
-                 get_variant("s", "World")
-             )),
--            error_name="not.known.AttributeError",
--            error_message="Property2 of Interface is not writable."
-+            error_name="not.known.Error.AttributeError",
-+            error_message="The property Interface.Property2 "
-+                          "is not writable."
-         )
-         self.assertEqual(self.object.Property2, "Hello")
- 
-@@ -250,8 +254,9 @@ class DBusServerTestCase(unittest.TestCase):
-                 "Interface",
-                 "Property3"
-             )),
--            error_name="not.known.AttributeError",
--            error_message="Property3 of Interface is not readable."
-+            error_name="not.known.Error.AttributeError",
-+            error_message="The property Interface.Property3 "
-+                          "is not readable."
-         )
-         self._call_method(
-             "org.freedesktop.DBus.Properties", "Set",
--- 
-2.26.2
-

SOURCES/0002-Handle-all-errors-of-the-DBus-call.patch

@@ -1,152 +0,0 @@
-From e3c082e3619ab2d9095b58e55c90157f6376fd1e Mon Sep 17 00:00:00 2001
-From: Vendula Poncova <vponcova@redhat.com>
-Date: Thu, 16 Jul 2020 20:24:25 +0200
-Subject: [PATCH 2/2] Handle all errors of the DBus call
-
-Don't handle only errors caused by the method invocation, but handle
-also errors caused by processing the result of the method.
----
- dasbus/client/handler.py |  3 +--
- dasbus/server/handler.py | 11 +++++------
- tests/test_client.py     | 16 ++++++++++++++++
- tests/test_server.py     | 36 ++++++++++++++++++++++++++++++------
- 4 files changed, 52 insertions(+), 14 deletions(-)
-
-diff --git a/dasbus/client/handler.py b/dasbus/client/handler.py
-index ed1a690..839f5a6 100644
---- a/dasbus/client/handler.py
-+++ b/dasbus/client/handler.py
-@@ -472,10 +472,9 @@ class ClientObjectHandler(AbstractClientObjectHandler):
-         """
-         try:
-             result = call(*args, **kwargs)
-+            return self._handle_method_result(result)
-         except Exception as error:  # pylint: disable=broad-except
-             return self._handle_method_error(error)
--        else:
--            return self._handle_method_result(result)
- 
-     def _handle_method_error(self, error):
-         """Handle an error of a DBus call.
-diff --git a/dasbus/server/handler.py b/dasbus/server/handler.py
-index 3871948..8183f26 100644
---- a/dasbus/server/handler.py
-+++ b/dasbus/server/handler.py
-@@ -420,6 +420,11 @@ class ServerObjectHandler(AbstractServerObjectHandler):
-                 method_name,
-                 *unwrap_variant(parameters)
-             )
-+            self._handle_method_result(
-+                invocation,
-+                member,
-+                result
-+            )
-         except Exception as error:  # pylint: disable=broad-except
-             self._handle_method_error(
-                 invocation,
-@@ -427,12 +432,6 @@ class ServerObjectHandler(AbstractServerObjectHandler):
-                 method_name,
-                 error
-             )
--        else:
--            self._handle_method_result(
--                invocation,
--                member,
--                result
--            )
- 
-     def _handle_method_error(self, invocation, interface_name, method_name,
-                              error):
-diff --git a/tests/test_client.py b/tests/test_client.py
-index 7cb96c3..cd44552 100644
---- a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -256,6 +256,22 @@ class DBusClientTestCase(unittest.TestCase):
-             str(cm.exception)
-         )
- 
-+    def test_invalid_method_result(self):
-+        """Test a method proxy with an invalid result."""
-+        self._create_proxy("""
-+        <node>
-+            <interface name="Interface">
-+                <method name="Method">
-+                    <arg direction="out" name="return" type="t"/>
-+                </method>
-+            </interface>
-+        </node>
-+        """)
-+
-+        self._set_reply(get_variant("i", -1))
-+        with self.assertRaises(TypeError):
-+            self.proxy.Method()
-+
-     def _set_reply(self, reply_value):
-         """Set the reply of the DBus call."""
-         self.connection.call_sync.reset_mock()
-diff --git a/tests/test_server.py b/tests/test_server.py
-index ce91b97..4adcf89 100644
---- a/tests/test_server.py
-+++ b/tests/test_server.py
-@@ -82,8 +82,8 @@ class DBusServerTestCase(unittest.TestCase):
- 
-     def _call_method_with_error(self, interface, method,
-                                 parameters=NO_PARAMETERS,
--                                error_name="",
--                                error_message=""):
-+                                error_name=None,
-+                                error_message=None):
-         invocation = Mock()
- 
-         with self.assertLogs(level='WARN'):
-@@ -94,12 +94,17 @@ class DBusServerTestCase(unittest.TestCase):
-                 parameters
-             )
- 
--        invocation.return_dbus_error.assert_called_once_with(
--            error_name,
--            error_message
--        )
-+        invocation.return_dbus_error.assert_called_once()
-         invocation.return_value.assert_not_called()
- 
-+        (name, msg), kwargs = invocation.return_dbus_error.call_args
-+
-+        self.assertEqual(kwargs, {})
-+        self.assertEqual(name, error_name, "Unexpected error name.")
-+
-+        if error_message is not None:
-+            self.assertEqual(msg, error_message, "Unexpected error message.")
-+
-     def test_register(self):
-         """Test the object registration."""
-         with self.assertRaises(DBusSpecificationError) as cm:
-@@ -193,6 +198,25 @@ class DBusServerTestCase(unittest.TestCase):
-             error_message="The method has failed."
-         )
- 
-+    def test_invalid_method_result(self):
-+        """Test a method with an invalid result."""
-+        self._publish_object("""
-+        <node>
-+            <interface name="Interface">
-+                <method name="Method">
-+                    <arg direction="out" name="return" type="t"/>
-+                </method>
-+            </interface>
-+        </node>
-+        """)
-+
-+        self.object.Method.return_value = -1
-+        self._call_method_with_error(
-+            "Interface",
-+            "Method",
-+            error_name="not.known.Error.OverflowError"
-+        )
-+
-     def test_property(self):
-         """Test the property publishing."""
-         self._publish_object("""
--- 
-2.26.2
-

SPECS/python-dasbus.spec

@@ -1,8 +1,8 @@
 %global srcname dasbus
 
 Name:           python-%{srcname}
-Version:        1.2
+Version:        1.5
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        DBus library in Python 3
 
 License:        LGPLv2+
@@ -11,11 +11,6 @@ Source0:        %{pypi_source}
 
 BuildArch:      noarch
 
-# Handle all errors of the DBus call
-# https://bugzilla.redhat.com/show_bug.cgi?id=1858757
-Patch0: 0001-Fix-tests-for-handling-DBus-errors-on-the-server-sid.patch
-Patch1: 0002-Handle-all-errors-of-the-DBus-call.patch
-
 %global _description %{expand:
 Dasbus is a DBus library written in Python 3, based on
 GLib and inspired by pydbus. It is designed to be easy
@@ -33,7 +28,7 @@ Requires:       python3-gobject-base
 %description -n python3-%{srcname} %{_description}
 
 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%autosetup -n %{srcname}-%{version}
 
 %build
 %py3_build
@@ -48,8 +43,35 @@ Requires:       python3-gobject-base
 %{python3_sitelib}/%{srcname}/
 
 %changelog
-* Mon Jul 27 2020 Vendula Poncova <vponcova@redhat.com> - 1.2-2
+* Mon Jul 07 2025 Katerina Koukiou <k.koukiou@gmail.com> - 1.5-1
-- Handle all errors of the DBus call (#1858757) (vponcova)
+- Update to version 1.5
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.4-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 24 2020 Vendula Poncova <vponcova@redhat.com> - 1.4-1
+- Handle all errors of the DBus call (vponcova)
+- Fix tests for handling DBus errors on the server side (vponcova)
+- Run packit smoke tests for all Fedora (jkonecny)
+- Fix packit archive creation (jkonecny)
+- Add possibility to change setup.py arguments (jkonecny)
+* Wed Jun 17 2020 Vendula Poncova <vponcova@redhat.com> - 1.3-1
+- Document differences between dasbus and pydbus (vponcova)
+- Improve the support for interface proxies in the service identifier (vponcova)
+- Improve the support for interface proxies in the message bus (vponcova)
+- Test the interface proxies (vponcova)
+- Make the message bus of a service identifier accessible (vponcova)
+- Fix the testing environment for Fedora Rawhide (vponcova)
 * Mon May 18 2020 Vendula Poncova <vponcova@redhat.com> - 1.2-1
 - Replace ABC with ABCMeta (vponcova)
 - Fix typing tests (vponcova)