tools v6.0.1

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/adobekey.py

@@ -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])