[XML-SIG] XBEL Patch to msie_parse.py

[Mark Hammond]

This is a multi-part message in MIME format.

------=_NextPart_000_0026_01BE261C.8D32D090
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Better late than never :-)

Ive attached a diff which attempts to use the "win32api" module to
locate the favorites folder in the registry.  It has been tested on NT
and 98, but only on English systems - Im fairly sure that it will also
work on non-English systems and Windows 95, but all testing
appreciated :-)

I took the approach that a command line arg could point to the
favorites folder - if not specified, then it attempts to use win32api
to find it.  If that fails, it prints a message asking for the command
line param.

Also note that there where a couple of other changes WRT the arguments
to certain functions - it appears this file did not keep up to date
with bookmark.py

Mark.

------=_NextPart_000_0026_01BE261C.8D32D090
Content-Type: application/octet-stream;
	name="msie_parse.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
	filename="msie_parse.diff"

KioqIFx0ZW1wXG1zaWVfcGFyc2UucHkJV2VkIERlYyAwMiAyMjozNDowMiAxOTk4Ci0tLSBtc2ll
X3BhcnNlLnB5CVNhdCBEZWMgMTIgMjE6MDg6NDkgMTk5OAoqKioqKioqKioqKioqKioKKioqIDE3
LDI4ICoqKioKICBjbGFzcyBNU0lFOg0KICAgICAgIyBpbnRlcm5ldCBleHBsb3Jlcg0KICANCiEg
ICAgIGRlZiBfX2luaXRfXyhzZWxmLGJvb2ttYXJrcyk6DQohICAgICAgICAgIyBGSVhNRTogdXNl
IHJlZ2lzdHJ5IGZvciB0aGlzIQ0KISANCiAgICAgICAgICBzZWxmLmJtcz1ib29rbWFya3MNCiAg
ICAgICAgICBzZWxmLnJvb3QgPSBOb25lDQohICAgICAgICAgc2VsZi5wYXRoID0gb3MucGF0aC5q
b2luKFVTUkRJUiwgRElSKQ0KICANCiAgICAgICAgICBzZWxmLl9fd2FsaygpDQogIA0KLS0tIDE3
LDI2IC0tLS0KICBjbGFzcyBNU0lFOg0KICAgICAgIyBpbnRlcm5ldCBleHBsb3Jlcg0KICANCiEg
ICAgIGRlZiBfX2luaXRfXyhzZWxmLGJvb2ttYXJrcywgcGF0aCk6DQogICAgICAgICAgc2VsZi5i
bXM9Ym9va21hcmtzDQogICAgICAgICAgc2VsZi5yb290ID0gTm9uZQ0KISAgICAgICAgIHNlbGYu
cGF0aCA9IHBhdGgNCiAgDQogICAgICAgICAgc2VsZi5fX3dhbGsoKQ0KICANCioqKioqKioqKioq
KioqKgoqKiogMzIsNDQgKioqKgogICAgICAgICAgZm9yIGZpbGUgaW4gb3MubGlzdGRpcihwYXRo
KToNCiAgICAgICAgICAgICAgZnVsbG5hbWUgPSBvcy5wYXRoLmpvaW4ocGF0aCwgZmlsZSkNCiAg
ICAgICAgICAgICAgaWYgb3MucGF0aC5pc2RpcihmdWxsbmFtZSk6DQohICAgICAgICAgICAgICAg
ICBzZWxmLmJtcy5hZGRfZm9sZGVyKGZpbGUsTm9uZSxOb25lKQ0KICAgICAgICAgICAgICAgICAg
c2VsZi5fX3dhbGsoc3VicGF0aCArIFtmaWxlXSkNCiAgICAgICAgICAgICAgZWxzZToNCiAgICAg
ICAgICAgICAgICAgIHVybCA9IHNlbGYuX19nZXR1cmwoZnVsbG5hbWUpDQogICAgICAgICAgICAg
ICAgICBpZiB1cmw6DQogICAgICAgICAgICAgICAgICAgICAgc2VsZi5ibXMuYWRkX2Jvb2ttYXJr
KG9zLnBhdGguc3BsaXRleHQoZmlsZSlbMF0sTm9uZSwNCiEgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgTm9uZSx1cmwpDQogIA0KICAgICAgZGVmIF9fZ2V0dXJsKHNl
bGYsIGZpbGUpOg0KICAgICAgICAgIHRyeToNCi0tLSAzMCw0MiAtLS0tCiAgICAgICAgICBmb3Ig
ZmlsZSBpbiBvcy5saXN0ZGlyKHBhdGgpOg0KICAgICAgICAgICAgICBmdWxsbmFtZSA9IG9zLnBh
dGguam9pbihwYXRoLCBmaWxlKQ0KICAgICAgICAgICAgICBpZiBvcy5wYXRoLmlzZGlyKGZ1bGxu
YW1lKToNCiEgICAgICAgICAgICAgICAgIHNlbGYuYm1zLmFkZF9mb2xkZXIoZmlsZSxOb25lKQ0K
ICAgICAgICAgICAgICAgICAgc2VsZi5fX3dhbGsoc3VicGF0aCArIFtmaWxlXSkNCiAgICAgICAg
ICAgICAgZWxzZToNCiAgICAgICAgICAgICAgICAgIHVybCA9IHNlbGYuX19nZXR1cmwoZnVsbG5h
bWUpDQogICAgICAgICAgICAgICAgICBpZiB1cmw6DQogICAgICAgICAgICAgICAgICAgICAgc2Vs
Zi5ibXMuYWRkX2Jvb2ttYXJrKG9zLnBhdGguc3BsaXRleHQoZmlsZSlbMF0sTm9uZSwNCiEgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTm9uZSxOb25lLHVybCkNCiAg
DQogICAgICBkZWYgX19nZXR1cmwoc2VsZiwgZmlsZSk6DQogICAgICAgICAgdHJ5Og0KKioqKioq
KioqKioqKioqCioqKiA1OCw2MiAqKioqCiAgIyAtLS0gVGVzdHByb2dyYW0NCiAgDQogIGlmIF9f
bmFtZV9fID09ICdfX21haW5fXyc6DQohICAgICBtc2llPU1TSUUoYm9va21hcmsuQm9va21hcmtz
KCkpDQogICAgICBtc2llLmJtcy5kdW1wX3hiZWwoKQ0KLS0tIDU2LDc3IC0tLS0KICAjIC0tLSBU
ZXN0cHJvZ3JhbQ0KICANCiAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoNCiEgICAgIGltcG9y
dCBzeXMNCiEgICAgIGlmIGxlbihzeXMuYXJndik+MToNCiEgICAgICAgICBwYXRoID0gc3lzLmFy
Z3ZbMV0NCiEgICAgIGVsc2U6DQohICAgICAgICAgdHJ5Og0KISAgICAgICAgICAgICBpbXBvcnQg
d2luMzJhcGksIHdpbjMyY29uDQohICAgICAgICAgZXhjZXB0IEltcG9ydEVycm9yOg0KISAgICAg
ICAgICAgICBwcmludCAiVGhlIHdpbjMyYXBpIG1vZHVsZSBpcyBub3QgYXZhaWxhYmxlIG9uIHRo
aXMgc3lzdGVtIg0KISAgICAgICAgICAgICBwcmludCAic28gd2UgY2FudCBhdXRvbWF0aWNhbGx5
IGZpbmQgeW91ciBmYXZvcml0ZXMgZm9sZGVyLiINCiEgICAgICAgICAgICAgcHJpbnQgIlBsZWFz
ZSByZS1ydW4gdGhpcyBwcm9ncmFtIHNwZWNpZml5aW5nIHRoZSBsb2NhdGlvbiBvZiB5b3VyIg0K
ISAgICAgICAgICAgICBwcmludCAiZmF2b3JpdGVzIGZvbGRlciBvbiB0aGUgY29tbWFuZCBsaW5l
LiINCiEgICAgICAgICAgICAgc3lzLmV4aXQoMSkNCiEgICAgICAgICBrZXluYW1lID0gciJTb2Z0
d2FyZVxNaWNyb3NvZnRcV2luZG93c1xDdXJyZW50VmVyc2lvblxFeHBsb3JlclxTaGVsbCBGb2xk
ZXJzIg0KISAgICAgICAgIGhrZXkgPSB3aW4zMmFwaS5SZWdPcGVuS2V5KHdpbjMyY29uLkhLRVlf
Q1VSUkVOVF9VU0VSLCBrZXluYW1lKQ0KISAgICAgICAgIHBhdGgsIHBhdGh0eXBlID0gd2luMzJh
cGkuUmVnUXVlcnlWYWx1ZUV4KGhrZXksICJGYXZvcml0ZXMiKQ0KISAgICAgICAgIGFzc2VydCBw
YXRodHlwZSA9PSB3aW4zMmNvbi5SRUdfU1oNCiEgDQohICAgICBtc2llPU1TSUUoYm9va21hcmsu
Qm9va21hcmtzKCksIHBhdGgpDQogICAgICBtc2llLmJtcy5kdW1wX3hiZWwoKQ0K

------=_NextPart_000_0026_01BE261C.8D32D090--