Cleanup / SafeUnbuffered bugfix

diff --git a/DeDRM_plugin/__init__.py b/DeDRM_plugin/__init__.py
index 8ac3c9a0d1851a94c162ac1f2064594d240203e6..13a919021c5a6ae48e9aabcb746d83c0a9f34161 100644 (file)
--- a/DeDRM_plugin/__init__.py
+++ b/DeDRM_plugin/__init__.py
@@ -134,7 +134,7 @@ except:
     config_dir = ""
 
 
-from utilities import SafeUnbuffered
+import utilities
 
 
 PLUGIN_NAME = __version.PLUGIN_NAME
@@ -998,8 +998,8 @@ class DeDRM(FileTypePlugin):
     def run(self, path_to_ebook):
 
         # make sure any unicode output gets converted safely with 'replace'
-        sys.stdout=SafeUnbuffered(sys.stdout)
-        sys.stderr=SafeUnbuffered(sys.stderr)
+        sys.stdout=utilities.SafeUnbuffered(sys.stdout)
+        sys.stderr=utilities.SafeUnbuffered(sys.stderr)
 
         print("{0} v{1}: Trying to decrypt {2}".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook)))
         self.starttime = time.time()

diff --git a/DeDRM_plugin/utilities.py b/DeDRM_plugin/utilities.py
index 949b1691d40440993f2728a7cd0fcc5c7c7be5c8..50a7de845cc5d93a5f9a265b796def058047ddfc 100644 (file)
--- a/DeDRM_plugin/utilities.py
+++ b/DeDRM_plugin/utilities.py
@@ -3,7 +3,6 @@
 
 #@@CALIBRE_COMPAT_CODE@@
 
-from ignoblekeyGenPassHash import generate_key
 import sys
 
 __license__ = 'GPL v3'
@@ -22,17 +21,6 @@ def uStrCmp (s1, s2, caseless=False):
     else:
         return ud.normalize('NFC', str1) == ud.normalize('NFC', str2)
 
-def parseCustString(keystuff):
-    userkeys = []
-    ar = keystuff.split(':')
-    for i in ar:
-        try:
-            name, ccn = i.split(',')
-            # Generate Barnes & Noble EPUB user key from name and credit card number.
-            userkeys.append(generate_key(name, ccn))
-        except:
-            pass
-    return userkeys
 
 
 # Wrap a stream so that output gets flushed immediately