summaryrefslogtreecommitdiff
path: root/sleekxmpp/__init__.py
AgeCommit message (Collapse)Author
2010-06-02Merge branch 'master' into hacksThom Nichols
2010-06-02removed unnecessary flags and arguments from disconnect methodThom Nichols
2010-06-03hack fix for session before bindNathan Fritz
2010-06-03if binding and session are advertised in the same go, do session firstNathan Fritz
2010-06-01fixed some major reconnection errorsThom Nichols
2010-06-01merged a lot of fritzy's changesThom Nichols
2010-05-14fixed SRV query - should use dns.rdatatype.SRVTom Nichols
2010-05-12mergedTom Nichols
2010-05-12some reconnetion fixesTom Nichols
2010-05-13Fixes for disconnection problems detailed in ↵Brian Beggs
http://github.com/fritzy/SleekXMPP/issues/#issue/20 Fixes to both ClientXMPP & xmlstream. ClientXMPP was not tracking the changes to authenticated and sessionstarted after the client was disconnected. xmlstream had some funkyness with state in the _process method that was cleaned up and hopefully made a little cleaner. Also changed a DNS issue that was occuring that rendered me unable to disconnect. I would recieve the following error upon reconnect. Exception in thread process: Exception in thread process: Traceback (most recent call last): File "/usr/local/lib/python2.6/threading.py", line 532, in __bootstrap_inner self.run() File "/usr/local/lib/python2.6/threading.py", line 484, in run self.__target(*self.__args, **self.__kwargs) File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/xmlstream/xmlstream.py", line 202, in _process self.reconnect() File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/__init__.py", line 134, in reconnect XMLStream.reconnect(self) File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/xmlstream/xmlstream.py", line 289, in reconnect self.connect() File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/__init__.py", line 99, in connect answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server, "SRV") File "/usr/local/lib/python2.6/site-packages/dns/resolver.py", line 732, in query return get_default_resolver().query(qname, rdtype, rdclass, tcp, source) File "/usr/local/lib/python2.6/site-packages/dns/resolver.py", line 617, in query source=source) File "/usr/local/lib/python2.6/site-packages/dns/query.py", line 113, in udp wire = q.to_wire() File "/usr/local/lib/python2.6/site-packages/dns/message.py", line 404, in to_wire r.add_question(rrset.name, rrset.rdtype, rrset.rdclass) File "/usr/local/lib/python2.6/site-packages/dns/renderer.py", line 152, in add_question self.output.write(struct.pack("!HH", rdtype, rdclass)) TypeError: unsupported operand type(s) for &: 'unicode' and 'long' Seems I was getting this error when calling line 99 in ClientXMPP. You can't bit-shift a 1 and a string and this is why this error is coming up. I removed the "SRV" argument and used the default of 1. not sure exactly what this should be so it may need to be fixed back before it's merged back to trunk. The line in question: answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server, "SRV")
2010-04-07replaced usage of deprecated iq result on send. Fixed old send result to use ↵Nathan Fritz
stanzas instead of ElementTree
2010-03-26changed license to MITsleek-0.9RC10.9RC1Nathan Fritz
2010-03-26closed bug #8 -- double auth responseNathan Fritz
2010-03-26fixed bug #16 Roster not updatingNathan Fritz
2010-01-08* python 2.6 compatibilityNathan Fritz
2009-12-11* started converstion to stanza objectsNathan Fritz
2009-12-10tweaked stanzas for easy useNathan Fritz
2009-12-10* added proper message and iq stanzas. presence left to doNathan Fritz
2009-09-25bugfixesNathan Fritz
2009-09-01* fixed some python3 transition bugsNathan Fritz
* added status options to muc joining
2009-08-31* converted sleekxmpp to Python 3.xNathan Fritz
* sleekxmpp no longer spawns threads for callback handlers -- there are now two threads: one for handlers and one for reading. callback handlers can get results from the read queue directly with the "wait" handler which is used in .send() for the reply catching argument.
2009-06-25made disconnect cleanerNathan Fritz
2009-06-24(no commit message)Nathan Fritz
2009-06-16* bugfixesNathan Fritz
2009-06-03moved seesmic branch to trunkNathan Fritz