From d7ba7cc72a65d005ba3702b4254609f6da6a80ca Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 8 Apr 2011 16:14:22 -0400 Subject: Use underscore method name. Since camelcase names are aliased to the underscored name at startup, if the underscored version is replaced later, the camelCase name does not reflect the change. --- sleekxmpp/stanza/iq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp') diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py index 2bfbc7b1..82ab13ec 100644 --- a/sleekxmpp/stanza/iq.py +++ b/sleekxmpp/stanza/iq.py @@ -77,7 +77,7 @@ class Iq(RootStanza): StanzaBase.__init__(self, *args, **kwargs) if self['id'] == '': if self.stream is not None: - self['id'] = self.stream.getNewId() + self['id'] = self.stream.new_id() else: self['id'] = '0' -- cgit v1.2.3 From 87ccd804ff346f3c2aa06b2be9479b1f82817c12 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 8 Apr 2011 16:39:39 -0400 Subject: Add version info. May now use sleekxmpp.__version__ and sleekxmpp.__version_info__. --- sleekxmpp/__init__.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sleekxmpp') diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index 20f43671..5ad11742 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -14,3 +14,6 @@ from sleekxmpp.xmlstream.handler import * from sleekxmpp.xmlstream import XMLStream, RestartStream from sleekxmpp.xmlstream.matcher import * from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET + +__version__ = '1.0beta5' +__version_info__ = (1, 0, 0, 'beta5', 0) -- cgit v1.2.3 From 1d891858b63c1e3ac10a39920c3e65159cfc8d72 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Mon, 11 Apr 2011 14:22:32 -0400 Subject: Mark scheduler thread as a daemon. --- sleekxmpp/xmlstream/scheduler.py | 1 + 1 file changed, 1 insertion(+) (limited to 'sleekxmpp') diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py index 0e711b4b..12deeddf 100644 --- a/sleekxmpp/xmlstream/scheduler.py +++ b/sleekxmpp/xmlstream/scheduler.py @@ -132,6 +132,7 @@ class Scheduler(object): if threaded: self.thread = threading.Thread(name='sheduler_process', target=self._process) + self.thread.daemon = True self.thread.start() else: self._process() -- cgit v1.2.3 From 016aac69f6328a2227e1770e78b44ae8e727b11a Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Thu, 14 Apr 2011 17:34:33 -0700 Subject: Pubsub/Unsubscribe was not getting registered --- sleekxmpp/plugins/stanza_pubsub.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sleekxmpp') diff --git a/sleekxmpp/plugins/stanza_pubsub.py b/sleekxmpp/plugins/stanza_pubsub.py index 2d809a35..b5964537 100644 --- a/sleekxmpp/plugins/stanza_pubsub.py +++ b/sleekxmpp/plugins/stanza_pubsub.py @@ -237,6 +237,8 @@ class Unsubscribe(ElementBase): def getJid(self): return JID(self._getAttr('jid')) +registerStanzaPlugin(Pubsub, Unsubscribe) + class Subscribe(ElementBase): namespace = 'http://jabber.org/protocol/pubsub' name = 'subscribe' -- cgit v1.2.3 From 5399fdd3a95377bfb5bba993f299664557cabb7c Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Tue, 26 Apr 2011 16:32:58 -0400 Subject: Add support for testing that no stanzas are sent in tests. Use: self.send(None) --- sleekxmpp/test/sleektest.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sleekxmpp') diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py index c5f48895..fd47a87e 100644 --- a/sleekxmpp/test/sleektest.py +++ b/sleekxmpp/test/sleektest.py @@ -600,8 +600,13 @@ class SleekTest(unittest.TestCase): Defaults to the value of self.match_method. """ sent = self.xmpp.socket.next_sent(timeout) + if data is None and sent is None: + return + if data is None and sent is not None: + self.fail("Stanza data was sent: %s" % sent) if sent is None: self.fail("No stanza was sent.") + xml = self.parse_xml(sent) self.fix_namespaces(xml, 'jabber:client') sent = self.xmpp._build_stanza(xml, 'jabber:client') -- cgit v1.2.3 From 9f1648328f17b608651989606b9cf2636cdcfbec Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 20 May 2011 12:56:00 -0400 Subject: Resolve timeout errors for get_roster. See issue #89 Using get_roster will now return the same types of values as Iq.send. If a timeout occurs, then the event 'roster_timeout' will be fired. A successful call to get_roster will also raise the 'roster_received' event. To ensure that the get_roster call was successful, here is a pattern to follow: def __init__(self, ...): ... self.add_event_handler('session_start', self.session_start) self.add_event_handler('roster_timeout', self.roster_timeout) self.add_event_handler('roster_received', self.roster_received) def session_start(self, e): self.send_presence() self.get_roster() def roster_timeout(self, e): # Optionally increase the timeout period self.get_roster(timeout=self.response_timeout * 2) def roster_received(self, iq): # Do stuff, roster has been initialized. ... --- sleekxmpp/clientxmpp.py | 53 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) (limited to 'sleekxmpp') diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index 20cc9417..c518a4ce 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -206,7 +206,8 @@ class ClientXMPP(BaseXMPP): pointer, breaker)) - def update_roster(self, jid, name=None, subscription=None, groups=[]): + def update_roster(self, jid, name=None, subscription=None, groups=[], + block=True, timeout=None, callback=None): """ Add or change a roster item. @@ -217,12 +218,24 @@ class ClientXMPP(BaseXMPP): 'to', 'from', 'both', or 'none'. If set to 'remove', the entry will be deleted. groups -- The roster groups that contain this item. + block -- Specify if the roster request will block + until a response is received, or a timeout + occurs. Defaults to True. + timeout -- The length of time (in seconds) to wait + for a response before continuing if blocking + is used. Defaults to self.response_timeout. + callback -- Optional reference to a stream handler function. + Will be executed when the roster is received. + Implies block=False. """ - iq = self.Iq()._set_stanza_values({'type': 'set'}) + iq = self.Iq() + iq['type'] = 'set' iq['roster']['items'] = {jid: {'name': name, 'subscription': subscription, 'groups': groups}} - response = iq.send() + response = iq.send(block, timeout, callback) + if response in [False, None]: + return response return response['type'] == 'result' def del_roster_item(self, jid): @@ -235,11 +248,33 @@ class ClientXMPP(BaseXMPP): """ return self.update_roster(jid, subscription='remove') - def get_roster(self): - """Request the roster from the server.""" - iq = self.Iq()._set_stanza_values({'type': 'get'}).enable('roster') - response = iq.send() - self._handle_roster(response, request=True) + def get_roster(self, block=True, timeout=None, callback=None): + """ + Request the roster from the server. + + Arguments: + block -- Specify if the roster request will block until a + response is received, or a timeout occurs. + Defaults to True. + timeout -- The length of time (in seconds) to wait for a response + before continuing if blocking is used. + Defaults to self.response_timeout. + callback -- Optional reference to a stream handler function. Will + be executed when the roster is received. + Implies block=False. + """ + iq = self.Iq() + iq['type'] = 'get' + iq.enable('roster') + response = iq.send(block, timeout, callback) + + if response == False: + self.event('roster_timeout') + + if response in [False, None] or not isinstance(response, Iq): + return response + else: + return self._handle_roster(response, request=True) def _handle_stream_features(self, features): """ @@ -431,12 +466,14 @@ class ClientXMPP(BaseXMPP): 'presence': {}, 'in_roster': True} self.roster[jid].update(iq['roster']['items'][jid]) + self.event('roster_received', iq) self.event("roster_update", iq) if iq['type'] == 'set': iq.reply() iq.enable('roster') iq.send() + return True # To comply with PEP8, method names now use underscores. -- cgit v1.2.3