mirror of
git://github.com/kovidgoyal/calibre.git
synced 2025-12-24 22:26:09 +01:00
Dont put biplist in backports
This commit is contained in:
parent
58b35f1aab
commit
ac5b5c9957
3 changed files with 6 additions and 3 deletions
|
|
@ -9,9 +9,14 @@
|
|||
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')
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,5 @@
|
|||
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue