diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2006-05-22 02:20:37 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2006-05-22 02:20:37 (GMT) |
commit | 325fb8ff252e933aada3d6fccffa58e00c12f05b (patch) | |
tree | fe0606d129498869a38244b0b6653619fc183cc9 /sugar/p2p/Stream.py | |
parent | 3841ac9983df5e8307ad2aa2ffa89edf7aa23030 (diff) |
Add an emoticons menu
Diffstat (limited to 'sugar/p2p/Stream.py')
-rw-r--r-- | sugar/p2p/Stream.py | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/sugar/p2p/Stream.py b/sugar/p2p/Stream.py index e6c1a91..77d8945 100644 --- a/sugar/p2p/Stream.py +++ b/sugar/p2p/Stream.py @@ -1,14 +1,11 @@ import xmlrpclib import socket -import traceback import network from MostlyReliablePipe import MostlyReliablePipe class Stream(object): def __init__(self, service, group): - if not service: - raise ValueError("service must be valid") self._service = service self._group = group self._owner_nick_name = self._group.get_owner().get_nick_name() @@ -35,8 +32,6 @@ class Stream(object): class UnicastStreamWriter(object): def __init__(self, stream, service, owner_nick_name): # set up the writer - if not service: - raise ValueError("service must be valid") self._service = service self._owner_nick_name = owner_nick_name self._address = self._service.get_address() @@ -45,7 +40,6 @@ class UnicastStreamWriter(object): self._writer = xmlrpclib.ServerProxy(self._xmlrpc_addr) def write(self, data): - """Write some data to the default endpoint of this pipe on the remote server.""" try: self._writer.message(self._owner_nick_name, data) return True @@ -53,15 +47,6 @@ class UnicastStreamWriter(object): traceback.print_exc() return False - def custom_request(self, method_name, *args): - """Call a custom XML-RPC method on the remote server.""" - try: - method = getattr(self._writer, method_name) - return method(*args) - except (socket.error, xmlrpclib.Fault, xmlrpclib.ProtocolError): - traceback.print_exc() - return None - class UnicastStream(Stream): def __init__(self, service, group): @@ -77,23 +62,18 @@ class UnicastStream(Stream): while not started and tries > 0: try: self._reader = network.GlibXMLRPCServer(("", port)) - self._reader.register_function(self._message, "message") + self._reader.register_instance(self) started = True except(socket.error): port = port + 1 tries = tries - 1 self._service.set_port(port) - def _message(self, nick_name, message): + def message(self, nick_name, message): """Called by the XMLRPC server when network data arrives.""" self.recv(nick_name, message) return True - def register_handler(self, handler, name): - if name == "message": - raise ValueError("Handler name 'message' is a reserved handler.") - self._reader.register_function(handler, name) - def new_writer(self, service): return UnicastStreamWriter(self, service, self._owner_nick_name) |