From 5a502dbce3a1898ec9387468e68f3d7007a22e6e Mon Sep 17 00:00:00 2001 From: Apprentice Alf Date: Sat, 18 May 2013 19:37:05 +0100 Subject: [PATCH] DeDRM plugin 6.0.6 (Only the plugin seems to have been updated for the 6.0.6 release.) --- DeDRM_calibre_plugin/DeDRM_plugin.zip | Bin 334075 -> 334094 bytes DeDRM_calibre_plugin/DeDRM_plugin/__init__.py | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip index d3b1b9157c4d63910b2c0f72e43b46257fbc5c15..6f6c7a511e7637162ea825d88e8294ed4778ee99 100644 GIT binary patch delta 5465 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 LK^qD9?n(b2Gms;C delta 5427 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 diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py index 830b66d..77423e1 100644 --- a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py +++ b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py @@ -31,13 +31,14 @@ __docformat__ = 'restructuredtext en' # 6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names # 6.0.4 - Fixes for stand-alone scripts and applications # and pdb files in plugin and initial conversion of prefs. +# 6.0.6 - Fix up an incorrect function call """ Decrypt DRMed ebooks. """ PLUGIN_NAME = u"DeDRM" -PLUGIN_VERSION_TUPLE = (6, 0, 5) +PLUGIN_VERSION_TUPLE = (6, 0, 6) PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE]) # Include an html helpfile in the plugin's zipfile with the following name. RESOURCE_NAME = PLUGIN_NAME + '_Help.htm' @@ -216,7 +217,7 @@ class DeDRM(FileTypePlugin): else: # linux from wineutils import WineGetKeys - scriptpath = os.join(self.alfdir,u"adobekey.py") + scriptpath = os.path.join(self.alfdir,u"adobekey.py") defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix']) self.default_key = default_keys[0] @@ -311,7 +312,7 @@ class DeDRM(FileTypePlugin): try: from wineutils import WineGetKeys - scriptpath = os.join(self.alfdir,u"adobekey.py") + scriptpath = os.path.join(self.alfdir,u"adobekey.py") defaultkeys = self.WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix']) except: pass @@ -389,7 +390,7 @@ class DeDRM(FileTypePlugin): else: # linux from wineutils import WineGetKeys - scriptpath = os.join(self.alfdir,u"kindlekey.py") + scriptpath = os.path.join(self.alfdir,u"kindlekey.py") defaultkeys = self.WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix']) except: pass