Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont put biplist in backports

Browse Source
This commit is contained in:
Kovid Goyal 2020-04-21 22:49:45 +05:30
parent 58b35f1aab
commit ac5b5c9957
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/backports/biplist.py → src/biplist/__init__.py
View File

7
src/calibre/utils/open_with/osx.py
View File

@ -9,9 +9,14 @@ import os, re, mimetypes, subprocess
from collections import defaultdict from collections import defaultdict
from calibre.ptempfile import TemporaryDirectory from calibre.ptempfile import TemporaryDirectory
from calibre.constants import ispy3
from calibre.utils.icu import numeric_sort_key from calibre.utils.icu import numeric_sort_key
from polyglot.builtins import iteritems, string_or_bytes 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') application_locations = ('/Applications', '~/Applications', '~/Desktop')

2
src/polyglot/plistlib.py
View File

@ -8,7 +8,5 @@ from polyglot.builtins import is_py3
if is_py3: if is_py3:
from plistlib import loads, dumps, Data # noqa from plistlib import loads, dumps, Data # noqa
loads_binary_or_xml = loads
else: else:
from plistlib import readPlistFromString as loads, writePlistToString as dumps, Data # noqa from plistlib import readPlistFromString as loads, writePlistToString as dumps, Data # noqa
from backports.biplist import readPlistFromString as loads_binary_or_xml # noqa