Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-01-20 12:46:32 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-01-20 12:46:32 (GMT)
commitd36e20159e298ba2dbc138a5369bfa32f0a3bce1 (patch)
tree466327b601296873a2d383df4256110bb5dfc272 /shell
parent4cdf88f31d5c81d57d8ff340fd471d6079618660 (diff)
Our xmlrpc implementation does not work with python 2.5.
Try/except it and log an error.
Diffstat (limited to 'shell')
-rw-r--r--shell/model/Owner.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/shell/model/Owner.py b/shell/model/Owner.py
index 49386a9..419b5fe 100644
--- a/shell/model/Owner.py
+++ b/shell/model/Owner.py
@@ -74,9 +74,13 @@ class ShellOwner(object):
self._service = self._pservice.register_service(self._nick,
PRESENCE_SERVICE_TYPE, properties=props)
logging.debug("Owner '%s' using port %d" % (self._nick, self._service.get_port()))
- self._icon_stream = Stream.Stream.new_from_service(self._service)
- self._icon_stream.register_reader_handler(self._handle_buddy_icon_request, "get_buddy_icon")
- self._icon_stream.register_reader_handler(self._handle_invite, "invite")
+
+ try:
+ self._icon_stream = Stream.Stream.new_from_service(self._service)
+ self._icon_stream.register_reader_handler(self._handle_buddy_icon_request, "get_buddy_icon")
+ self._icon_stream.register_reader_handler(self._handle_invite, "invite")
+ except:
+ logging.error('Our xmlprc implementation does not work with Python 2.5')
def _handle_buddy_icon_request(self):
"""XMLRPC method, return the owner's icon encoded with base64."""