From 5b2baa7233bf0890db90eac01a3399dc83ef48e4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 2 Jul 2020 08:42:18 +0530
Subject: [PATCH] Fix for plistlib dropping Data in python 3.9

Fixes #1184 (plistlib.Data is going to be dropped in python 3.9)
---
 src/calibre/utils/config.py | 16 ++++++----------
 src/polyglot/plistlib.py    | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index 42f45d75be..6c242d8b6f 100644
--- a/src/calibre/utils/config.py
+++ b/src/calibre/utils/config.py
@@ -363,29 +363,25 @@ class XMLConfig(dict):
         self.update(d)
 
     def __getitem__(self, key):
-        from polyglot.plistlib import Data
+        from polyglot.plistlib import unwrap_bytes
         try:
             ans = dict.__getitem__(self, key)
-            if isinstance(ans, Data):
-                ans = ans.data
-            return ans
+            return unwrap_bytes(ans)
         except KeyError:
             return self.defaults.get(key, None)
 
     def get(self, key, default=None):
-        from polyglot.plistlib import Data
+        from polyglot.plistlib import unwrap_bytes
         try:
             ans = dict.__getitem__(self, key)
-            if isinstance(ans, Data):
-                ans = ans.data
-            return ans
+            return unwrap_bytes(ans)
         except KeyError:
             return self.defaults.get(key, default)
 
     def __setitem__(self, key, val):
-        from polyglot.plistlib import Data
+        from polyglot.plistlib import wrap_bytes
         if isinstance(val, bytes):
-            val = Data(val)
+            val = wrap_bytes(val)
         dict.__setitem__(self, key, val)
         self.commit()
 
diff --git a/src/polyglot/plistlib.py b/src/polyglot/plistlib.py
index d428ab3d2f..a0c6a19850 100644
--- a/src/polyglot/plistlib.py
+++ b/src/polyglot/plistlib.py
@@ -7,6 +7,20 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from polyglot.builtins import is_py3
 
 if is_py3:
-    from plistlib import loads, dumps, Data  # noqa
+    from plistlib import loads, dumps  # noqa
+
+    def unwrap_bytes(x):
+        return x
+
+    def wrap_bytes(x):
+        return x
 else:
     from plistlib import readPlistFromString as loads, writePlistToString as dumps, Data  # noqa
+
+    def unwrap_bytes(x):
+        if isinstance(x, Data):
+            x = x.data
+        return x
+
+    def wrap_bytes(x):
+        return Data(x)