|
 |
bbf737f |
diff -Nur calibre-4.19.0.orig/src/calibre/utils/config.py calibre-4.19.0/src/calibre/utils/config.py
|
|
|
bbf737f |
--- calibre-4.19.0.orig/src/calibre/utils/config.py 2020-07-01 17:51:39.590637064 -0700
|
|
|
bbf737f |
+++ calibre-4.19.0/src/calibre/utils/config.py 2020-07-01 17:50:51.287601015 -0700
|
|
|
bbf737f |
@@ -363,29 +363,26 @@
|
|
|
bbf737f |
self.update(d)
|
|
|
bbf737f |
|
|
|
bbf737f |
def __getitem__(self, key):
|
|
|
bbf737f |
- from polyglot.plistlib import Data
|
|
|
bbf737f |
try:
|
|
|
bbf737f |
ans = dict.__getitem__(self, key)
|
|
|
bbf737f |
- if isinstance(ans, Data):
|
|
|
bbf737f |
+ if isinstance(ans, bytes):
|
|
|
bbf737f |
ans = ans.data
|
|
|
bbf737f |
return ans
|
|
|
bbf737f |
except KeyError:
|
|
|
bbf737f |
return self.defaults.get(key, None)
|
|
|
bbf737f |
|
|
|
bbf737f |
def get(self, key, default=None):
|
|
|
bbf737f |
- from polyglot.plistlib import Data
|
|
|
bbf737f |
try:
|
|
|
bbf737f |
ans = dict.__getitem__(self, key)
|
|
|
bbf737f |
- if isinstance(ans, Data):
|
|
|
bbf737f |
+ if isinstance(ans, bytes):
|
|
|
bbf737f |
ans = ans.data
|
|
|
bbf737f |
return ans
|
|
|
bbf737f |
except KeyError:
|
|
|
bbf737f |
return self.defaults.get(key, default)
|
|
|
bbf737f |
|
|
|
bbf737f |
def __setitem__(self, key, val):
|
|
|
bbf737f |
- from polyglot.plistlib import Data
|
|
|
bbf737f |
if isinstance(val, bytes):
|
|
|
bbf737f |
- val = Data(val)
|
|
|
bbf737f |
+ val = bytes(val)
|
|
|
bbf737f |
dict.__setitem__(self, key, val)
|
|
|
bbf737f |
self.commit()
|
|
|
bbf737f |
|
|
|
bbf737f |
diff -Nur calibre-4.19.0.orig/src/polyglot/plistlib.py calibre-4.19.0/src/polyglot/plistlib.py
|
|
|
bbf737f |
--- calibre-4.19.0.orig/src/polyglot/plistlib.py 2020-07-01 17:51:39.601637072 -0700
|
|
|
bbf737f |
+++ calibre-4.19.0/src/polyglot/plistlib.py 2020-07-01 17:51:23.458625025 -0700
|
|
|
bbf737f |
@@ -6,6 +6,6 @@
|
|
|
bbf737f |
from polyglot.builtins import is_py3
|
|
|
bbf737f |
|
|
|
bbf737f |
if is_py3:
|
|
|
bbf737f |
- from plistlib import loads, dumps, Data # noqa
|
|
|
bbf737f |
+ from plistlib import loads, dumps # noqa
|
|
|
bbf737f |
else:
|
|
|
bbf737f |
from plistlib import readPlistFromString as loads, writePlistToString as dumps, Data # noqa
|