diff options
| author | NoDRM <[email protected]> | 2022-08-07 09:30:24 +0200 |
|---|---|---|
| committer | NoDRM <[email protected]> | 2022-08-07 09:30:24 +0200 |
| commit | b12e567c5fdf06c22bf583329bf9e0b70cae0735 (patch) | |
| tree | 03398a94a7ffb1d04722e29f1acf30a965990666 /DeDRM_plugin | |
| parent | ca6d30b2d91cff47f67f9b6acc3927a51374a450 (diff) | |
Cleanup / SafeUnbuffered bugfix
Diffstat (limited to 'DeDRM_plugin')
| -rw-r--r-- | DeDRM_plugin/__init__.py | 6 | ||||
| -rw-r--r-- | DeDRM_plugin/utilities.py | 12 |
2 files changed, 3 insertions, 15 deletions
diff --git a/DeDRM_plugin/__init__.py b/DeDRM_plugin/__init__.py index 8ac3c9a..13a9190 100644 --- 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 949b169..50a7de8 100644 --- 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 |