DeDRM plugin 6.0.6

(Only the plugin seems to have been updated for the 6.0.6 release.)

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip
index d3b1b9157c4d63910b2c0f72e43b46257fbc5c15..6f6c7a511e7637162ea825d88e8294ed4778ee99 100644 (file)
Binary files a/DeDRM_calibre_plugin/DeDRM_plugin.zip and b/DeDRM_calibre_plugin/DeDRM_plugin.zip differ

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
index 830b66df27789b7feb2570da2aea3c4ce1688113..77423e12b6cbc47cbab932cbbbed80710ba88fcf 100644 (file)
--- 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