summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-05-11refactored presence tracking and fixed jidInRoomNathan Fritz
2010-05-11Merge branch 'master' of git@github.com:fritzy/SleekXMPPNathan Fritz
2010-05-11use pubsub settingsNathan Fritz
2010-04-30added collection testsNathan Fritz
2010-04-23pubsub test workNathan Fritz
2010-04-22forgot to add file required to pass testall.pyNathan Fritz
2010-04-22bugfixes and continuing to work on pubsub testsNathan Fritz
2010-04-21added pubsub#event stanzas, multi-subtypes iterable stanzas, pubsub#event ↵Nathan Fritz
test coverage
2010-04-20started work on pubsub#event stanzasNathan Fritz
2010-04-19added pubsub tests and fixed match on iterator errorNathan Fritz
2010-04-18changed_status event now happens with got_offline/got_online eventsNathan Fritz
2010-04-14initial add of pubsub server interaction testsNathan Fritz
2010-04-14adding tests, fixed stanzapath matching to match keys, fixed pubsub#owner ↵Nathan Fritz
stanzas
2010-04-13bugfix for .disconnect() hangingNathan Fritz
2010-04-13bugfix for .disconnect() hangingNathan Fritz
2010-04-08fixed presence stanza. priority can be set.Matthias Rieber
2010-04-07fixed html-im stanza pluginNathan Fritz
2010-04-07added missing docstrings to tests and added deprecated warning to ↵Nathan Fritz
basexmpp.send when using xml mask waiting
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 #7 -- muc roster leakNathan Fritz
2010-03-26fixed bug #16 Roster not updatingNathan Fritz
2010-03-26added memleak test and attempted to fix presence leakNathan Fritz
2010-03-24stanzabase indent fixNathan Fritz
2010-03-24fix for bug #18Nathan Fritz
2010-03-15fixed xmlstream filesocket issueNathan Fritz
2010-03-04added muc functionalityNathan Fritz
2010-02-27fixed some presence bugsNathan Fritz
2010-02-25fixed some unicode problems for 2.6Nathan Fritz
2010-02-24apparently setup.py if statement *does* work.. adding it back inNathan Fritz
2010-02-15Merge branch 'develop'Nathan Fritz
2010-02-15got rid of stupid iq set/get/error/result methodsNathan Fritz
2010-02-15tweaked presence handlerNathan Fritz
2010-02-15added send queueing to avoid mixed sendingNathan Fritz
2010-01-29Merge branch 'develop'Nathan Fritz
2010-01-29fixed setup.py issue with unicode in 3.xNathan Fritz
2010-01-29Merge branch 'develop'Nathan Fritz
2010-01-29added separate tostring filesNathan Fritz
2010-01-29fixed unicode problems in 2.6Nathan Fritz
2010-01-27Merge branch 'master' of git@github.com:fritzy/SleekXMPPNathan Fritz
2010-01-27Merge branch 'develop'Nathan Fritz
2010-01-27Merge branch 'issue-10' into developNathan Fritz
2010-01-27fixed status change issueNathan Fritz
2010-01-27Merge branch 'master' of github.com:fritzy/SleekXMPPNathan Fritz
2010-01-27fixed 2.6 compatibility for componentxmppNathan Fritz
2010-01-25Merge branch 'master' of github.com:fritzy/SleekXMPPNathan Fritz
2010-01-25removed stupid monkeypatch for filesocketNathan Fritz
2010-01-23fixed presence['type'] w/ show value bug and added test to proveNathan Fritz