From ac5b5c9957923e08af08ac22e0a11db818ea01fc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 21 Apr 2020 22:49:45 +0530
Subject: [PATCH] Dont put biplist in backports

---
 src/{backports/biplist.py => biplist/__init__.py} | 0
 src/calibre/utils/open_with/osx.py                | 7 ++++++-
 src/polyglot/plistlib.py                          | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename src/{backports/biplist.py => biplist/__init__.py} (100%)

diff --git a/src/backports/biplist.py b/src/biplist/__init__.py
similarity index 100%
rename from src/backports/biplist.py
rename to src/biplist/__init__.py
diff --git a/src/calibre/utils/open_with/osx.py b/src/calibre/utils/open_with/osx.py
index d2592336a1..3ee0d4cb51 100644
--- a/src/calibre/utils/open_with/osx.py
+++ b/src/calibre/utils/open_with/osx.py
@@ -9,9 +9,14 @@ import os, re, mimetypes, subprocess
 from collections import defaultdict
 
 from calibre.ptempfile import TemporaryDirectory
+from calibre.constants import ispy3
 from calibre.utils.icu import numeric_sort_key
 from polyglot.builtins import iteritems, string_or_bytes
-from polyglot.plistlib import loads_binary_or_xml as loads
+
+if ispy3:
+    from plistlib import loads
+else:
+    from biplist import readPlistFromString as loads
 
 application_locations = ('/Applications', '~/Applications', '~/Desktop')
 
diff --git a/src/polyglot/plistlib.py b/src/polyglot/plistlib.py
index 797ba37ff9..d428ab3d2f 100644
--- a/src/polyglot/plistlib.py
+++ b/src/polyglot/plistlib.py
@@ -8,7 +8,5 @@ from polyglot.builtins import is_py3
 
 if is_py3:
     from plistlib import loads, dumps, Data  # noqa
-    loads_binary_or_xml = loads
 else:
     from plistlib import readPlistFromString as loads, writePlistToString as dumps, Data  # noqa
-    from backports.biplist import readPlistFromString as loads_binary_or_xml  # noqa