When user sets reply_handler but not error_handler raise MissingReplyHandlerException instead of MissingErrorHandlerException, and vice versa (fd.o #12304, patch from René Neumann)

2 files changed, 6 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 5e43947..1889546 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,11 @@
-D-Bus Python Bindings 0.82.4 (unreleased)
+D-Bus Python Bindings 0.82.4 (2007-12-10)
 =========================================
 
 Fixes:
 
+* supplying reply_handler but not error_handler raises
+  MissingReplyHandlerException instead of MissingErrorHandlerException,
+  and vice versa (fd.o #12304, patch from René Neumann)
 * Using non-recursive make for dbus/ directory should fix builds in some
   environments (fd.o #12741)
 
diff --git a/dbus/proxies.py b/dbus/proxies.py
index 15136ca..cbb5d53 100644
--- a/dbus/proxies.py
+++ b/dbus/proxies.py
@@ -105,9 +105,9 @@ class _ProxyMethod:
 
         if reply_handler is not None or error_handler is not None:
             if reply_handler is None:
-                raise MissingErrorHandlerException()
-            elif error_handler is None:
                 raise MissingReplyHandlerException()
+            elif error_handler is None:
+                raise MissingErrorHandlerException()
             elif ignore_reply:
                 raise TypeError('ignore_reply and reply_handler cannot be '
                                 'used together')