@@ -1 +1,2 @@ -SleekMigrate requires SleekXMPP. In the same folder as SleekMigrate, run svn co svn://netflint.net/sleekxmpp +SleekMigrate requires SleekXMPP. In the same folder as SleekMigrate, run + svn co svn://netflint.net/sleekxmpp/trunk sleekxmpp README @@ -18,7 +18,7 @@ """ import logging -import sleekxmpp.sleekxmpp as sleekxmpp +import sleekxmpp from optparse import OptionParser from xml.etree import cElementTree as ET @@ -123,9 +123,9 @@ class XEP0227Exporter(object): def finalise(self): ET.ElementTree(self.element).write(self.fileName) -class XMPPAccountExtractor(sleekxmpp.xmppclient): +class XMPPAccountExtractor(sleekxmpp.ClientXMPP): def __init__(self, jid, password, ssl=False, plugin_config = {}, plugin_whitelist=[]): - sleekxmpp.xmppclient.__init__(self, jid, password, ssl, plugin_config, plugin_whitelist) + sleekxmpp.ClientXMPP.__init__(self, jid, password, ssl, plugin_config, plugin_whitelist) logging.info("Logging in as %s" % self.jid) self.add_event_handler("session_start", self.start, threaded=True) self.add_event_handler("roster_update", self.receive_roster) @@ -139,7 +139,7 @@ class XMPPAccountExtractor(sleekxmpp.xmppclient): def start(self, event): self.sessionOkay = True - self.requestRoster() + self.getRoster() while not self.vcardDone or not self.rosterDone or not self.privatesDone: time.sleep(1) @@ -232,9 +232,7 @@ if __name__ == '__main__': extractor.connect() else: extractor.connect((opts.hostname, 5222)) - extractor.process() - while extractor.connected: - time.sleep(1) + extractor.process(threaded=False) if extractor.export_okay(): exporter.export(extractor.getAccount()) exporter.finalise() sleekmigrate.py a74fdb240dc44eb38cf476edb59d67bb083360ad Remko Tronçon git@el-tramo.be http://github.com/Kev/sleekmigrate/commit/44175070ec8b4a488f3267df31b3a622dd9f16cf 44175070ec8b4a488f3267df31b3a622dd9f16cf 2009-09-15T14:00:32-07:00 2009-07-01T09:11:56-07:00 Fixed script to work with latest SleekXMPP trunk. b9a110627076a7c9964ff44eec83ceaa25aa31e5 Kevin Smith git@kismith.co.uk