TST: Close PdfMerger in tests (#1260)

py-pdf · Aug 20, 2022 · baf0de1 · baf0de1
1 parent 0983fe4
commit baf0de1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 19 deletions.
diff --git a/tests/bench.py b/tests/bench.py
@@ -56,36 +56,36 @@ def merge():
     pdf_forms = RESOURCE_ROOT / "pdflatex-forms.pdf"
     pdf_pw = RESOURCE_ROOT / "libreoffice-writer-password.pdf"
 
-    file_merger = PyPDF2.PdfMerger()
+    merger = PyPDF2.PdfMerger()
 
     # string path:
-    file_merger.append(pdf_path)
-    file_merger.append(outline)
-    file_merger.append(pdf_path, pages=PyPDF2.pagerange.PageRange(slice(0, 0)))
-    file_merger.append(pdf_forms)
+    merger.append(pdf_path)
+    merger.append(outline)
+    merger.append(pdf_path, pages=PyPDF2.pagerange.PageRange(slice(0, 0)))
+    merger.append(pdf_forms)
 
     # Merging an encrypted file
     reader = PyPDF2.PdfReader(pdf_pw)
     reader.decrypt("openpassword")
-    file_merger.append(reader)
+    merger.append(reader)
 
     # PdfReader object:
-    file_merger.append(PyPDF2.PdfReader(pdf_path, "rb"), outline_item=True)
+    merger.append(PyPDF2.PdfReader(pdf_path, "rb"), outline_item=True)
 
     # File handle
     with open(pdf_path, "rb") as fh:
-        file_merger.append(fh)
+        merger.append(fh)
 
-    outline_item = file_merger.add_outline_item("An outline item", 0)
-    file_merger.add_outline_item("deeper", 0, parent=outline_item)
-    file_merger.add_metadata({"author": "Martin Thoma"})
-    file_merger.add_named_destination("title", 0)
-    file_merger.set_page_layout("/SinglePage")
-    file_merger.set_page_mode("/UseThumbs")
+    outline_item = merger.add_outline_item("An outline item", 0)
+    merger.add_outline_item("deeper", 0, parent=outline_item)
+    merger.add_metadata({"author": "Martin Thoma"})
+    merger.add_named_destination("title", 0)
+    merger.set_page_layout("/SinglePage")
+    merger.set_page_mode("/UseThumbs")
 
     tmp_path = "dont_commit_merged.pdf"
-    file_merger.write(tmp_path)
-    file_merger.close()
+    merger.write(tmp_path)
+    merger.close()
 
     # Check if outline is correct
     reader = PyPDF2.PdfReader(tmp_path)

diff --git a/tests/test_encryption.py b/tests/test_encryption.py
@@ -135,15 +135,15 @@ def test_get_page_of_encrypted_file_new_algorithm(pdffile, password):
 )
 @pytest.mark.skipif(not HAS_PYCRYPTODOME, reason="No pycryptodome")
 def test_encryption_merge(names):
-    pdf_merger = PyPDF2.PdfMerger()
+    merger = PyPDF2.PdfMerger()
     files = [RESOURCE_ROOT / "encryption" / x for x in names]
     pdfs = [PyPDF2.PdfReader(x) for x in files]
     for pdf in pdfs:
         if pdf.is_encrypted:
             pdf.decrypt("asdfzxcv")
-        pdf_merger.append(pdf)
+        merger.append(pdf)
     # no need to write to file
-    pdf_merger.close()
+    merger.close()
 
 
 @pytest.mark.parametrize(

diff --git a/tests/test_merger.py b/tests/test_merger.py
@@ -221,6 +221,7 @@ def test_trim_outline_list():
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
 
     # cleanup
     os.remove("tmp-merger-do-not-commit.pdf")
@@ -233,6 +234,7 @@ def test_zoom():
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
 
     # cleanup
     os.remove("tmp-merger-do-not-commit.pdf")
@@ -245,6 +247,7 @@ def test_zoom_xyz_no_left():
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
 
     # cleanup
     os.remove("tmp-merger-do-not-commit.pdf")
@@ -257,6 +260,7 @@ def test_outline_item():
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
 
     # cleanup
     os.remove("tmp-merger-do-not-commit.pdf")
@@ -269,6 +273,7 @@ def test_trim_outline():
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
 
     # cleanup
     os.remove("tmp-merger-do-not-commit.pdf")
@@ -281,6 +286,7 @@ def test1():
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
 
     # cleanup
     os.remove("tmp-merger-do-not-commit.pdf")
@@ -294,6 +300,7 @@ def test_sweep_recursion1():
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
 
     reader2 = PdfReader("tmp-merger-do-not-commit.pdf")
     reader2.pages
@@ -321,6 +328,7 @@ def test_sweep_recursion2(url, name):
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
 
     reader2 = PdfReader("tmp-merger-do-not-commit.pdf")
     reader2.pages
@@ -336,6 +344,7 @@ def test_sweep_indirect_list_newobj_is_None(caplog):
     merger = PdfMerger()
     merger.append(reader)
     merger.write("tmp-merger-do-not-commit.pdf")
+    merger.close()
     assert "Object 21 0 not defined." in caplog.text
 
     reader2 = PdfReader("tmp-merger-do-not-commit.pdf")
@@ -351,6 +360,7 @@ def test_iss1145():
     name = "iss1145.pdf"
     merger = PdfMerger()
     merger.append(PdfReader(BytesIO(get_pdf_from_url(url, name=name))))
+    merger.close()
 
 
 def test_deprecate_bookmark_decorator_warning():