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

2020-01-30 11:58:50 +00:00
parent 5bb6b58bc1 a107742191
commit f5dd758b1b
19 changed files with 114 additions and 76 deletions
--- a/dedrm_src/scriptinterface.py
+++ b/dedrm_src/scriptinterface.py
@@ -115,6 +115,7 @@ def decryptpdf(infile, outdir, rscpath):


 def decryptpdb(infile, outdir, rscpath):
+    errlog = ''
    outname = os.path.splitext(os.path.basename(infile))[0] + ".pmlz"
    outpath = os.path.join(outdir, outname)
    rv = 1
@@ -142,6 +143,7 @@ def decryptpdb(infile, outdir, rscpath):


 def decryptk4mobi(infile, outdir, rscpath):
+    errlog = ''
    rv = 1
    pidnums = []
    pidspath = os.path.join(rscpath,'pidlist.txt')