From 2eb1424703522732493baaeb628196a0e335d79f Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Tue, 31 Mar 2020 19:46:31 +0100 Subject: [PATCH] Replace deprecated plistlib.readPlistFromBytes() in bookmarks.safari Remove Python 2 code. plistlib.loads() was added in Python 3.4. --- linkcheck/bookmarks/safari.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/linkcheck/bookmarks/safari.py b/linkcheck/bookmarks/safari.py index 6baab726..2e81025d 100644 --- a/linkcheck/bookmarks/safari.py +++ b/linkcheck/bookmarks/safari.py @@ -83,10 +83,7 @@ def get_plist_data_from_string (data): return biplist.readPlistFromString(data) # fall back to normal plistlist try: - if hasattr(plistlib, 'readPlistFromBytes'): # Python 3 - return plistlib.readPlistFromBytes(data) - else: - return plistlib.readPlistFromString(data) + return plistlib.loads(data) except Exception: # not parseable (eg. not well-formed, or binary) return {}