From 95186d0c29ec0d1f6c062cf5e63b35170df4d38f Mon Sep 17 00:00:00 2001 From: Guillaume Horel Date: Wed, 1 Dec 2010 01:23:58 -0500 Subject: More pep8 cleanups and fixed object.py --- server.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'server.py') diff --git a/server.py b/server.py index c553402..b572f22 100644 --- a/server.py +++ b/server.py @@ -20,12 +20,12 @@ class ObjectComponent(ComponentXMPP): self.userHandler = UserHandler(root) def start(self, event): - for user in self.userHandler.getUserList(): - self.sendPresence(pto = user) + for user in self.userHandler.get_user_list(): + self.send_presence(pto = user) def disconnect(self, reconnect = False): - for user in self.userHandler.getUserList(): - self.sendPresence(pto = user, ptype = "unavailable") + for user in self.userHandler.get_user_list(): + self.send_presence(pto = user, ptype = "unavailable") XMLStream.disconnect(self, reconnect) logging.info('Component {} disconnected'.format(self.boundjid.bare)) @@ -37,14 +37,14 @@ class ObjectComponent(ComponentXMPP): userJID = subscription["from"].full self.userHandler.register(userJID) subscription.reply().send() - self.sendPresence(pto = userJID) - self.sendPresenceSubscription(pto = userJID, ptype = "subscribe") + self.send_presence(pto = userJID) + self.send_presence_subscription(pto = userJID, ptype = "subscribe") if subscription["type"] == "unsubscribe": userJID = subscription["from"].full self.userHandler.unregister(userJID) def presence_probe(self, event): - self.sendPresence(pto = event["from"].full) + self.send_presence(pto = event["from"].full) if __name__ == '__main__': -- cgit v1.2.3-70-g09d2