From 7538dec99e901f0e0798fd667f4d7d1962dccca2 Mon Sep 17 00:00:00 2001 From: Martin Thoma Date: Fri, 15 Apr 2022 10:50:26 +0200 Subject: [PATCH] BUG: Fix merging encrypted files --- PyPDF2/merger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyPDF2/merger.py b/PyPDF2/merger.py index 00393bbb8..854d8cdb8 100644 --- a/PyPDF2/merger.py +++ b/PyPDF2/merger.py @@ -119,13 +119,13 @@ def merge(self, position, fileobj, bookmark=None, pages=None, import_bookmarks=T fileobj = StreamIO(filecontent) my_file = True elif isinstance(fileobj, PdfFileReader): + if hasattr(fileobj, '_decryption_key'): + decryption_key = fileobj._decryption_key orig_tell = fileobj.stream.tell() fileobj.stream.seek(0) filecontent = StreamIO(fileobj.stream.read()) fileobj.stream.seek(orig_tell) # reset the stream to its original location fileobj = filecontent - if hasattr(fileobj, '_decryption_key'): - decryption_key = fileobj._decryption_key my_file = True # Create a new PdfFileReader instance using the stream