-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Mar 14, 2009, at 6:22 PM, noreply@launchpad.net wrote:
@@ -510,6 +507,12 @@ try: msgfp = open(pckfile) msg = cPickle.load(msgfp) + if data == {}:
This looks a little Pythonically weird; maybe if len(data) == 0 instead?
+ # There was no .db file. Is this a post 2.1.5 .pck? + try: + data = cPickle.load(msgfp) + except EOFError: + pass os.unlink(pckfile) except EnvironmentError, e: if e.errno <> errno.ENOENT: raise
Barry -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Darwin) iQCVAwUBSbw52nEjvBPtnXfVAQKhmQP/aZDty8h2jtExUlcSUjsV98zIsxxajO92 ZmxdMc6NQd+42N+ZVvMJqdaQatUUbUArap+gvlLTxuPJOoFe0JjWfed79VMSFwkQ lvmR4EdJTby/tT95U72/w/gKjA/+KH9m6SgHdu06iUGTVaM+pzwLkqQK6/qQKpIY XHaxZpebxZ8= =lsE0 -----END PGP SIGNATURE-----