Merge branch 'master' into modernize-Python-2-codes

This commit is contained in:
Apprentice Harper
2020-01-30 11:58:50 +00:00
committed by GitHub
19 changed files with 114 additions and 76 deletions

View File

@@ -7,7 +7,7 @@ from __future__ import print_function
__license__ = 'GPL v3'
# Standard Python modules.
import os, sys, re, hashlib
import os, sys, re, hashlib, traceback
from calibre_plugins.dedrm.__init__ import PLUGIN_NAME, PLUGIN_VERSION
def WineGetKeys(scriptpath, extension, wineprefix=""):