Make plugin work in Calibre 6 (Qt 6)

diff --git a/DeDRM_plugin/adobekey.py b/DeDRM_plugin/adobekey.py
index d8e68d864d9d2b7220eaa360c0c0bca16a55931b..6155cff3030e8651a535cc3d3be5acc9e7bfb89f 100644 (file)
--- a/DeDRM_plugin/adobekey.py
+++ b/DeDRM_plugin/adobekey.py
@@ -136,7 +136,7 @@ if iswindows:
             if os.path.isfile(os.path.join(p, "libcrypto-1_1.dll")):
                 return os.path.join(p, "libcrypto-1_1.dll")
             if os.path.isfile(os.path.join(p, "libeay32.dll")):
-                return os.path.join(p, "libeay.dll")
+                return os.path.join(p, "libeay32.dll")
         return None
 
     def _load_crypto_libcrypto():

diff --git a/DeDRM_plugin/config.py b/DeDRM_plugin/config.py
index 40f645b3c1848c90c7cfdf5595d1a3f301682f4b..b3d924c9429d0745eea3bcee251ea71cffe28958 100755 (executable)
--- a/DeDRM_plugin/config.py
+++ b/DeDRM_plugin/config.py
@@ -327,7 +327,13 @@ class ManageKeysDialog(QDialog):
             self.export_key_button.setIcon(QIcon(I('save.png')))
             self.export_key_button.clicked.connect(self.export_key)
             button_layout.addWidget(self.export_key_button)
-        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        try: 
+            # QT 6
+            spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Policy.Minimum, QtGui.QSizePolicy.Policy.Expanding)
+        except AttributeError:
+            # QT 5
+            spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+
         button_layout.addItem(spacerItem)
 
         if self.wineprefix is not None:
@@ -811,7 +817,7 @@ class AddBandNKeyDialog(QDialog):
         self.cbType.addItem("Extract passhashes from Adobe Digital Editions")
         self.cbType.addItem("Extract key from Nook Windows application")
         self.cbType.addItem("Extract key from Nook Android application")
-        self.cbType.currentIndexChanged.connect(self.update_form, self.cbType.currentIndex())
+        self.cbType.currentIndexChanged.connect(lambda: self.update_form(self.cbType.currentIndex()))
         self.layout.addWidget(self.cbType)
 
         self.button_box = QDialogButtonBox(QDialogButtonBox.Cancel)

diff --git a/DeDRM_plugin/standalone/remove_drm.py b/DeDRM_plugin/standalone/remove_drm.py
index 5ab5f3364939438355aca3448bc84aa8bbbeaf5a..8273b973981ed8623068982fbd87056373383d58 100644 (file)
--- a/DeDRM_plugin/standalone/remove_drm.py
+++ b/DeDRM_plugin/standalone/remove_drm.py
@@ -142,7 +142,7 @@ def perform_action(params, files):
             return 0
 
     if overwrite_original and (output is not None or outputdir is not None):
-        print("Can't use --overwrite together with --output or --outputdir.")
+        print("Can't use --overwrite together with --output or --outputdir.", file=sys.stderr)
         return 1
 
     if output is not None and os.path.isfile(output) and not force:
@@ -155,8 +155,8 @@ def perform_action(params, files):
         return 1
     
     if outputdir is not None and output is not None and os.path.isabs(output): 
-        print("--output parameter is absolute path despite --outputdir being set.")
-        print("Remove --outputdir, or give a relative path to --output.")
+        print("--output parameter is absolute path despite --outputdir being set.", file=sys.stderr)
+        print("Remove --outputdir, or give a relative path to --output.", file=sys.stderr)
         return 1
 
 
@@ -166,7 +166,7 @@ def perform_action(params, files):
         file = os.path.abspath(file)
 
         if not os.path.isfile(file):
-            print("Skipping file " + file + " - not found.")
+            print("Skipping file " + file + " - not found.", file=sys.stderr)
             continue
 
         if overwrite_original:

diff --git a/Obok_plugin/config.py b/Obok_plugin/config.py
index deb29f9b4f6998c4f921b7c3695a86ece4cfe5c1..9a637f3205e77093dce5b5d4455869f66f5a6f65 100644 (file)
--- a/Obok_plugin/config.py
+++ b/Obok_plugin/config.py
@@ -118,7 +118,13 @@ class ManageKeysDialog(QDialog):
         self._delete_key_button.clicked.connect(self.delete_key)
         button_layout.addWidget(self._delete_key_button)
 
-        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        try: 
+            # QT 6
+            spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Policy.Minimum, QtGui.QSizePolicy.Policy.Expanding)
+        except AttributeError:
+            # QT 5
+            spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+            
         button_layout.addItem(spacerItem)
 
         layout.addSpacing(5)