Fix more Py2/Py3 stuff

diff --git a/DeDRM_plugin/__calibre_compat_code.py b/DeDRM_plugin/__calibre_compat_code.py
index 85eae0c7e85f1e394fe557d5edc7db684f347428..b44b8f399dcfd0966a6a85375e1dcf771c5203db 100644 (file)
--- a/DeDRM_plugin/__calibre_compat_code.py
+++ b/DeDRM_plugin/__calibre_compat_code.py
@@ -14,7 +14,8 @@ if "calibre" in sys.modules and sys.version_info[0] == 2:
     if os.path.join(config_dir, "plugins", "DeDRM.zip") not in sys.path:
         sys.path.insert(0, os.path.join(config_dir, "plugins", "DeDRM.zip"))
 
-# Explicitly set the package identifier so we are allowed to import stuff ...
-__package__ = "calibre_plugins.dedrm"
+if "calibre" in sys.modules:
+    # Explicitly set the package identifier so we are allowed to import stuff ...
+    __package__ = "calibre_plugins.dedrm"
 
 #@@CALIBRE_COMPAT_CODE_END@@

diff --git a/DeDRM_plugin/__main__.py b/DeDRM_plugin/__main__.py
index 96b4217929262b6a0e169b34cb910d4ea1957cd3..6c925d250663531ffe43bd350eff48d2d148cc64 100644 (file)
--- a/DeDRM_plugin/__main__.py
+++ b/DeDRM_plugin/__main__.py
@@ -5,10 +5,21 @@
 # (CLI interface without Calibre)
 # Copyright © 2021 NoDRM
 
+"""
+
+NOTE: This code is not functional (yet). I started working on it a while ago
+to make a standalone version of the plugins that could work without Calibre, 
+too, but for now there's only a rough code structure and no working code yet.
+
+Currently, to use these plugins, you will need to use Calibre. Hopwfully that'll
+change in the future. 
+
+"""
+
 __license__   = 'GPL v3'
 __docformat__ = 'restructuredtext en'
 
-# For revision history see __init__.py
+# For revision history see CHANGELOG.md
 
 """
 Run DeDRM plugin without Calibre.

diff --git a/DeDRM_plugin/convert2xml.py b/DeDRM_plugin/convert2xml.py
index 6af190bb211d32d524fad2cf8ed414d2d94dacfc..1a70844a8bfc4a16ed5afee7c67d6380b7c84515 100644 (file)
--- a/DeDRM_plugin/convert2xml.py
+++ b/DeDRM_plugin/convert2xml.py
@@ -5,7 +5,10 @@
 # For use with Topaz Scripts Version 2.6
 # Python 3, September 2020
 
-from utilities import SafeUnbuffered
+
+#@@CALIBRE_COMPAT_CODE@@
+
+from .utilities import SafeUnbuffered
 
 import sys
 import csv

diff --git a/DeDRM_plugin/epubtest.py b/DeDRM_plugin/epubtest.py
index 8b7fa041faeb4232e136dba8fdf2018e18185aa3..da0ee95429a7c4b59d0dceb0d48aa5829f87874e 100644 (file)
--- a/DeDRM_plugin/epubtest.py
+++ b/DeDRM_plugin/epubtest.py
@@ -49,6 +49,8 @@
 
 __version__ = '2.0'
 
+#@@CALIBRE_COMPAT_CODE@@
+
 import sys, struct, os, traceback
 import zlib
 import zipfile

diff --git a/DeDRM_plugin/genbook.py b/DeDRM_plugin/genbook.py
index b0624fd9862667f54611d83401e7b31ab7987111..0d49f10d0df2c4d14d530614bb7a55e544fd541a 100644 (file)
--- a/DeDRM_plugin/genbook.py
+++ b/DeDRM_plugin/genbook.py
@@ -4,7 +4,9 @@
 # Python 3 for calibre 5.0
 from __future__ import print_function
 
-from utilities import SafeUnbuffered
+#@@CALIBRE_COMPAT_CODE@@
+
+from .utilities import SafeUnbuffered
 
 import sys
 import csv

diff --git a/DeDRM_plugin/ignoblekeyGenPassHash.py b/DeDRM_plugin/ignoblekeyGenPassHash.py
index 65d1733075513b995d8eba93c15cbb660f376711..f050bd94414e14a7f7a9f23799f6c6e917bf690b 100644 (file)
--- a/DeDRM_plugin/ignoblekeyGenPassHash.py
+++ b/DeDRM_plugin/ignoblekeyGenPassHash.py
@@ -45,6 +45,8 @@ import os
 import hashlib
 import base64
 
+#@@CALIBRE_COMPAT_CODE@@
+
 try:
     from Cryptodome.Cipher import AES
 except ImportError:

diff --git a/DeDRM_plugin/ignoblekeyNookStudy.py b/DeDRM_plugin/ignoblekeyNookStudy.py
index 99db9b5d4c6084c68cb40f57654c5893f14cefc2..7916c39c253735795ce5a0148944025aca068ca0 100644 (file)
--- a/DeDRM_plugin/ignoblekeyNookStudy.py
+++ b/DeDRM_plugin/ignoblekeyNookStudy.py
@@ -27,6 +27,8 @@ import hashlib
 import getopt
 import re
 
+#@@CALIBRE_COMPAT_CODE@@
+
 from .utilities import SafeUnbuffered
 
 try:

diff --git a/DeDRM_plugin/ineptepub.py b/DeDRM_plugin/ineptepub.py
index b655ffd8f81a2bef618963390a85052633c98f47..3802f7192c1d8afca710849a288846ccaf712eb4 100644 (file)
--- a/DeDRM_plugin/ineptepub.py
+++ b/DeDRM_plugin/ineptepub.py
@@ -70,6 +70,8 @@ def unpad(data, padding=16):
 
     return data[:-pad_len]
 
+#@@CALIBRE_COMPAT_CODE@@
+
 from .utilities import SafeUnbuffered
 from .argv_utils import unicode_argv
 

diff --git a/DeDRM_plugin/ineptpdf.py b/DeDRM_plugin/ineptpdf.py
index 69a9ca5e3e98825baacc9335a5b5390cf6f0d19c..6d53b9589d5ddb68840be4fed0b94c3e51b25ce2 100755 (executable)
--- a/DeDRM_plugin/ineptpdf.py
+++ b/DeDRM_plugin/ineptpdf.py
@@ -92,13 +92,14 @@ def unpad(data, padding=16):
 
     return data[:-pad_len]
 
+#@@CALIBRE_COMPAT_CODE@@
 
 from .utilities import SafeUnbuffered
+from .argv_utils import unicode_argv
 
 iswindows = sys.platform.startswith('win')
 isosx = sys.platform.startswith('darwin')
 
-from .argv_utils import unicode_argv
 
 class ADEPTError(Exception):
     pass

diff --git a/DeDRM_plugin/ion.py b/DeDRM_plugin/ion.py
index 63084e0be689d61352685828cc3c168df45de567..7dd39a57ec1feeb23f0af11cf86e32815f874cb3 100644 (file)
--- a/DeDRM_plugin/ion.py
+++ b/DeDRM_plugin/ion.py
@@ -30,6 +30,9 @@ import struct
 
 from io import BytesIO
 
+#@@CALIBRE_COMPAT_CODE@@
+
+
 try:
     from Cryptodome.Cipher import AES
     from Cryptodome.Util.py3compat import bchr
@@ -57,7 +60,7 @@ except ImportError:
                 # Windows-friendly choice: pylzma wheels
                 import pylzma as lzma
 
-from kfxtables import *
+from .kfxtables import *
 
 TID_NULL = 0
 TID_BOOLEAN = 1

diff --git a/DeDRM_plugin/kindlekey.py b/DeDRM_plugin/kindlekey.py
index 9206d83c30b1597de7346cf78fc43791a045b283..9dc5381855b5b42efb8afd0c9beffd5c9573ce09 100644 (file)
--- a/DeDRM_plugin/kindlekey.py
+++ b/DeDRM_plugin/kindlekey.py
@@ -62,6 +62,8 @@ except NameError:
 
 # Routines common to Mac and PC
 
+#@@CALIBRE_COMPAT_CODE@@
+
 from .utilities import SafeUnbuffered
 from .argv_utils import unicode_argv
     

diff --git a/DeDRM_plugin/kindlepid.py b/DeDRM_plugin/kindlepid.py
index 2d53b9902563269cf4252b5067866c5f017e6a33..a851ee5653c2261b1908f0b613ff562a82845658 100644 (file)
--- a/DeDRM_plugin/kindlepid.py
+++ b/DeDRM_plugin/kindlepid.py
@@ -16,8 +16,9 @@
 import sys
 import binascii
 
-from .utilities import SafeUnbuffered
+#@@CALIBRE_COMPAT_CODE@@
 
+from .utilities import SafeUnbuffered
 from .argv_utils import unicode_argv
 
 letters = b'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'