tools v6.0.1

5 files changed, 17 insertions, 8 deletions

diff --git a/Other_Tools/B&N_Download_Helper/BN-Dload.user.js b/Other_Tools/B_and_N_Download_Helper/BN-Dload.user.js
index 6bb028f..6bb028f 100644
--- a/Other_Tools/B&N_Download_Helper/BN-Dload.user.js
+++ b/Other_Tools/B_and_N_Download_Helper/BN-Dload.user.js
diff --git a/Other_Tools/B&N_Download_Helper/BN-Dload.user_ReadMe.txt b/Other_Tools/B_and_N_Download_Helper/BN-Dload.user_ReadMe.txt
index bf0390b..bf0390b 100644
--- a/Other_Tools/B&N_Download_Helper/BN-Dload.user_ReadMe.txt
+++ b/Other_Tools/B_and_N_Download_Helper/BN-Dload.user_ReadMe.txt
diff --git a/Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw b/Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw
index 94f7522..1dcef1d 100644
--- a/Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw
+++ b/Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw
@@ -46,13 +46,14 @@ from __future__ import with_statement
 #   5.6 - Revised to allow use in Plugins to eliminate need for duplicate code
 #   5.7 - Unicode support added, renamed adobekey from ineptkey
 #   5.8 - Added getkey interface for Windows DeDRM application
+#   5.9 - moved unicode_argv call inside main for Windows DeDRM compatibility
 
 """
 Retrieve Adobe ADEPT user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '5.8'
+__version__ = '5.9'
 
 import sys, os, struct, getopt
 
@@ -483,7 +484,8 @@ def usage(progname):
     print u"Usage:"
     print u"    {0:s} [-h] [<outpath>]".format(progname)
 
-def cli_main(argv=unicode_argv()):
+def cli_main():
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
     print u"{0} v{1}\nCopyright © 2009-2013 i♥cabbages and Apprentice Alf".format(progname,__version__)
 
@@ -538,7 +540,7 @@ def cli_main(argv=unicode_argv()):
     return 0
 
 
-def gui_main(argv=unicode_argv()):
+def gui_main():
     import Tkinter
     import Tkconstants
     import tkMessageBox
@@ -556,6 +558,7 @@ def gui_main(argv=unicode_argv()):
             self.text.insert(Tkconstants.END, text)
 
 
+    argv=unicode_argv()
     root = Tkinter.Tk()
     root.withdraw()
     progpath, progname = os.path.split(argv[0])
diff --git a/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeygen.pyw b/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeygen.pyw
index ec78e65..a6e5dca 100644
--- a/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeygen.pyw
+++ b/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeygen.pyw
@@ -31,13 +31,14 @@ from __future__ import with_statement
 #   2.3 - Modify interface to allow use of import
 #   2.4 - Improvements to UI and now works in plugins
 #   2.5 - Additional improvement for unicode and plugin support
+#   2.6 - moved unicode_argv call inside main for Windows DeDRM compatibility
 
 """
 Generate Barnes & Noble EPUB user key from name and credit card number.
 """
 
 __license__ = 'GPL v3'
-__version__ = "2.5"
+__version__ = "2.6"
 
 import sys
 import os
@@ -214,7 +215,8 @@ def generate_key(name, ccn):
 
 
 
-def cli_main(argv=unicode_argv()):
+def cli_main():
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
     if AES is None:
         print "%s: This script requires OpenSSL or PyCrypto, which must be installed " \
diff --git a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw b/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
index e79622b..eb4ddd1 100644
--- a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
+++ b/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
@@ -15,13 +15,15 @@ from __future__ import with_statement
 #  1.3   - Added getkey interface for Windows DeDRM application
 #          Simplified some of the Kindle for Mac code.
 #  1.4   - Remove dependency on alfcrypto
+#  1.5   - moved unicode_argv call inside main for Windows DeDRM compatibility
+
 
 """
 Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.4'
+__version__ = '1.5'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1797,7 +1799,8 @@ def usage(progname):
     print u"    {0:s} [-h] [-k <kindle.info>] [<outpath>]".format(progname)
 
 
-def cli_main(argv=unicode_argv()):
+def cli_main():
+    argv=unicode_argv()
     progname = os.path.basename(argv[0])
     print u"{0} v{1}\nCopyright © 2010-2013 some_updates and Apprentice Alf".format(progname,__version__)
 
@@ -1837,7 +1840,7 @@ def cli_main(argv=unicode_argv()):
     return 0
 
 
-def gui_main(argv=unicode_argv()):
+def gui_main():
     import Tkinter
     import Tkconstants
     import tkMessageBox
@@ -1855,6 +1858,7 @@ def gui_main(argv=unicode_argv()):
             self.text.insert(Tkconstants.END, text)
 
 
+    argv=unicode_argv()
     root = Tkinter.Tk()
     root.withdraw()
     progpath, progname = os.path.split(argv[0])