print() is a function in Python since 1/1/2020

This commit is contained in:
Christian Clauss 2020-09-28 00:49:21 +02:00 committed by GitHub
parent 08bdacf476
commit 3f644ddfd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 16 deletions

View File

@ -19,6 +19,7 @@
""" """
Decrypts Barnes & Noble encrypted PDF files. Decrypts Barnes & Noble encrypted PDF files.
""" """
from __future__ import print_function
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = "0.1" __version__ = "0.1"
@ -428,7 +429,7 @@ class PSBaseParser(object):
if not pos: if not pos:
pos = self.bufpos+self.charpos pos = self.bufpos+self.charpos
self.fp.seek(pos) self.fp.seek(pos)
##print >>sys.stderr, 'poll(%d): %r' % (pos, self.fp.read(n)) # print('poll(%d): %r' % (pos, self.fp.read(n)), file=sys.stderr)
self.fp.seek(pos0) self.fp.seek(pos0)
return return
@ -753,7 +754,7 @@ class PSStackParser(PSBaseParser):
''' '''
while not self.results: while not self.results:
(pos, token) = self.nexttoken() (pos, token) = self.nexttoken()
##print (pos,token), (self.curtype, self.curstack) # print((pos, token), (self.curtype, self.curstack))
if (isinstance(token, int) or if (isinstance(token, int) or
isinstance(token, Decimal) or isinstance(token, Decimal) or
isinstance(token, bool) or isinstance(token, bool) or
@ -778,7 +779,7 @@ class PSStackParser(PSBaseParser):
try: try:
(pos, objs) = self.end_type('d') (pos, objs) = self.end_type('d')
if len(objs) % 2 != 0: if len(objs) % 2 != 0:
print "Incomplete dictionary construct" print("Incomplete dictionary construct")
objs.append("") # this isn't necessary. objs.append("") # this isn't necessary.
# temporary fix. is this due to rental books? # temporary fix. is this due to rental books?
# raise PSSyntaxError( # raise PSSyntaxError(
@ -1003,7 +1004,7 @@ class PDFStream(PDFObject):
if 'Filter' not in self.dic: if 'Filter' not in self.dic:
self.data = data self.data = data
self.rawdata = None self.rawdata = None
##print self.dict ##print(self.dict)
return return
filters = self.dic['Filter'] filters = self.dic['Filter']
if not isinstance(filters, list): if not isinstance(filters, list):
@ -1447,15 +1448,15 @@ class PDFDocument(object):
V = ord(bookkey[0]) V = ord(bookkey[0])
bookkey = bookkey[1:] bookkey = bookkey[1:]
else: else:
print "ebx_V is %d and ebx_type is %d" % (ebx_V, ebx_type) print("ebx_V is %d and ebx_type is %d" % (ebx_V, ebx_type))
print "length is %d and len(bookkey) is %d" % (length, len(bookkey)) print("length is %d and len(bookkey) is %d" % (length, len(bookkey)))
print "bookkey[0] is %d" % ord(bookkey[0]) print("bookkey[0] is %d" % ord(bookkey[0]))
raise IGNOBLEError('error decrypting book session key - mismatched length') raise IGNOBLEError('error decrypting book session key - mismatched length')
else: else:
# proper length unknown try with whatever you have # proper length unknown try with whatever you have
print "ebx_V is %d and ebx_type is %d" % (ebx_V, ebx_type) print("ebx_V is %d and ebx_type is %d" % (ebx_V, ebx_type))
print "length is %d and len(bookkey) is %d" % (length, len(bookkey)) print("length is %d and len(bookkey) is %d" % (length, len(bookkey)))
print "bookkey[0] is %d" % ord(bookkey[0]) print("bookkey[0] is %d" % ord(bookkey[0]))
if ebx_V == 3: if ebx_V == 3:
V = 3 V = 3
else: else:
@ -1500,7 +1501,7 @@ class PDFDocument(object):
plaintext = AES.new(key,AES.MODE_CBC,ivector).decrypt(data) plaintext = AES.new(key,AES.MODE_CBC,ivector).decrypt(data)
# remove pkcs#5 aes padding # remove pkcs#5 aes padding
cutter = -1 * ord(plaintext[-1]) cutter = -1 * ord(plaintext[-1])
#print cutter #print(cutter)
plaintext = plaintext[:cutter] plaintext = plaintext[:cutter]
return plaintext return plaintext
@ -1511,7 +1512,7 @@ class PDFDocument(object):
plaintext = AES.new(key,AES.MODE_CBC,ivector).decrypt(data) plaintext = AES.new(key,AES.MODE_CBC,ivector).decrypt(data)
# remove pkcs#5 aes padding # remove pkcs#5 aes padding
cutter = -1 * ord(plaintext[-1]) cutter = -1 * ord(plaintext[-1])
#print cutter #print(cutter)
plaintext = plaintext[:cutter] plaintext = plaintext[:cutter]
return plaintext return plaintext
@ -2010,7 +2011,7 @@ def decryptBook(userkey, inpath, outpath):
#try: #try:
serializer = PDFSerializer(inf, userkey) serializer = PDFSerializer(inf, userkey)
#except: #except:
# print "Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath)) # print("Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath)))
# return 2 # return 2
# hope this will fix the 'bad file descriptor' problem # hope this will fix the 'bad file descriptor' problem
with open(outpath, 'wb') as outf: with open(outpath, 'wb') as outf:
@ -2018,7 +2019,7 @@ def decryptBook(userkey, inpath, outpath):
try: try:
serializer.dump(outf) serializer.dump(outf)
except Exception, e: except Exception, e:
print "error writing pdf: {0}".format(e.args[0]) print("error writing pdf: {0}".format(e.args[0]))
return 2 return 2
return 0 return 0
@ -2029,13 +2030,13 @@ def cli_main():
argv=unicode_argv() argv=unicode_argv()
progname = os.path.basename(argv[0]) progname = os.path.basename(argv[0])
if len(argv) != 4: if len(argv) != 4:
print "usage: {0} <keyfile.b64> <inbook.pdf> <outbook.pdf>".format(progname) print("usage: {0} <keyfile.b64> <inbook.pdf> <outbook.pdf>".format(progname))
return 1 return 1
keypath, inpath, outpath = argv[1:] keypath, inpath, outpath = argv[1:]
userkey = open(keypath,'rb').read() userkey = open(keypath,'rb').read()
result = decryptBook(userkey, inpath, outpath) result = decryptBook(userkey, inpath, outpath)
if result == 0: if result == 0:
print "Successfully decrypted {0:s} as {1:s}".format(os.path.basename(inpath),os.path.basename(outpath)) print("Successfully decrypted {0:s} as {1:s}".format(os.path.basename(inpath),os.path.basename(outpath)))
return result return result