From: Jeremy Whiting <jpwhiting@kde.org>
Date: Fri, 2 Oct 2020 04:41:57 +0000 (-0600)
Subject: Use open instead of file() to export keys to file.
X-Git-Url: http://git.xmof.duckdns.org/?a=commitdiff_plain;h=9df15634928aaccdbe032fb7ee179704ac07f007;p=DeDRM.git

Use open instead of file() to export keys to file.

Fixes export of Kindle keys in calibre 5.0.1 here.
---

diff --git a/DeDRM_plugin/config.py b/DeDRM_plugin/config.py
index 93f69ae..ad6e82e 100644
--- a/DeDRM_plugin/config.py
+++ b/DeDRM_plugin/config.py
@@ -431,15 +431,15 @@ class ManageKeysDialog(QDialog):
         defaultname = "{0}.{1}".format(keyname, self.keyfile_ext)
         filename = choose_save_file(self, unique_dlg_name,  caption, filters, all_files=False, initial_filename=defaultname)
         if filename:
-            with file(filename, 'wb') as fname:
+            with open(filename, 'wb') as fname:
                 if self.binary_file:
                     fname.write(self.plugin_keys[keyname].decode('hex'))
                 elif self.json_file:
-                    fname.write(json.dumps(self.plugin_keys[keyname]))
+                    fname.write(json.dumps(self.plugin_keys[keyname]).encode())
                 elif self.android_file:
                     for key in self.plugin_keys[keyname]:
-                        fname.write(key)
-                        fname.write("\n")
+                        fname.write(key.encode())
+                        fname.write(b"\n")
                 else:
                     fname.write(self.plugin_keys[keyname])