diff options
author | Apprentice Harper <[email protected]> | 2020-09-26 21:22:47 +0100 |
---|---|---|
committer | Apprentice Harper <[email protected]> | 2020-09-26 21:22:47 +0100 |
commit | afa4ac571664368dc27512768a67656ea7dd645a (patch) | |
tree | 57ca18d568ce426ce3bfa27b45dff60efa803604 /Other_Tools | |
parent | 4868a7460e39910ad22d0949d26b3250656dea46 (diff) |
Starting on Version 7.0 using the work done by others. Completely untested. I will be testing things, but I thought I'd get this base version up for others to give pull requests.
THIS IS ON THE MASTER BRANCH. The Master branch will be Python 3.0 from now on. While Python 2.7 support will not be deliberately broken, all efforts should now focus on Python 3.0 compatibility.
I can see a lot of work has been done. There's more to do. I've bumped the version number of everything I came across to the next major number for Python 3.0 compatibility indication.
Thanks everyone. I hope to update here at least once a week until we have a stable 7.0 release for calibre 5.0
Diffstat (limited to 'Other_Tools')
-rw-r--r-- | Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw b/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw index dbadc5d..98ae209 100644 --- a/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw +++ b/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw @@ -4,7 +4,7 @@ from __future__ import with_statement # ignoblekey.py -# Copyright © 2015 Apprentice Alf and Apprentice Harper +# Copyright © 2015-2020 Apprentice Harper et al. # Based on kindlekey.py, Copyright © 2010-2013 by some_updates and Apprentice Alf @@ -14,13 +14,14 @@ from __future__ import with_statement # Revision history: # 1.0 - Initial release # 1.1 - remove duplicates and return last key as single key +# 2.0 - Python 3 """ Get Barnes & Noble EPUB user key from nook Studio log file """ __license__ = 'GPL v3' -__version__ = "1.1" +__version__ = "2.0" import sys import os @@ -318,7 +319,7 @@ def gui_main(): keyfileout.write(key) success = True tkMessageBox.showinfo(progname, u"Key successfully retrieved to {0}".format(outfile)) - except DrmException, e: + except DrmException as e: tkMessageBox.showerror(progname, u"Error: {0}".format(str(e))) except Exception: root.wm_state('normal') |