Python3: fix reading Safari bookmarks

This commit is contained in:
Petr Dlouhý 2018-01-06 18:29:55 +01:00
parent 256202a20b
commit e615480850

View file

@ -83,7 +83,10 @@ def get_plist_data_from_string (data):
return biplist.readPlistFromString(data)
# fall back to normal plistlist
try:
return plistlib.readPlistFromString(data)
if hasattr(plistlib, 'readPlistFromBytes'): # Python 3
return plistlib.readPlistFromBytes(data)
else:
return plistlib.readPlistFromString(data)
except Exception:
# not parseable (eg. not well-formed, or binary)
return {}