- Python 2.6 update: usage of deprecated BaseException.message dropped

1 files changed, 8 insertions, 4 deletions

diff --git a/pyxmpp/exceptions.py b/pyxmpp/exceptions.py
index 1f4300b..31c9aba 100644
--- a/pyxmpp/exceptions.py
+++ b/pyxmpp/exceptions.py
@@ -145,14 +145,18 @@ class ProtocolError(Error):
 
     def __init__(self, xmpp_name, message):
         self.args = (xmpp_name, message)
-        self.xmpp_name = xmpp_name
-        self.message = unicode(message)
+    @property
+    def xmpp_name(self):
+        return self.args[0]
+    @property
+    def message(self):
+        return self.args[1]
     def log_reported(self):
         self.logger_reported.debug(u"Protocol error detected: %s", self.message)
     def log_ignored(self):
         self.logger_ignored.debug(u"Protocol error detected: %s", self.message)
-    def __str__(self):
-        return str(self.message)
+    def __unicode__(self):
+        return str(self.args[1])
     def __repr__(self):
         return "<ProtocolError %r %r>" % (self.xmpp_name, self.message)