Skip to content

Commit 9855f03

Browse files
MartinThomaMartinThoma
committed
TST: Close PdfMerger in tests
1 parent 0983fe4 commit 9855f03

3 files changed

Lines changed: 29 additions & 19 deletions

File tree

‎tests/bench.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,36 +56,36 @@ def merge():
5656
pdf_forms = RESOURCE_ROOT / "pdflatex-forms.pdf"
5757
pdf_pw = RESOURCE_ROOT / "libreoffice-writer-password.pdf"
5858

59-
file_merger = PyPDF2.PdfMerger()
59+
merger = PyPDF2.PdfMerger()
6060

6161
# string path:
62-
file_merger.append(pdf_path)
63-
file_merger.append(outline)
64-
file_merger.append(pdf_path, pages=PyPDF2.pagerange.PageRange(slice(0, 0)))
65-
file_merger.append(pdf_forms)
62+
merger.append(pdf_path)
63+
merger.append(outline)
64+
merger.append(pdf_path, pages=PyPDF2.pagerange.PageRange(slice(0, 0)))
65+
merger.append(pdf_forms)
6666

6767
# Merging an encrypted file
6868
reader = PyPDF2.PdfReader(pdf_pw)
6969
reader.decrypt("openpassword")
70-
file_merger.append(reader)
70+
merger.append(reader)
7171

7272
# PdfReader object:
73-
file_merger.append(PyPDF2.PdfReader(pdf_path, "rb"), outline_item=True)
73+
merger.append(PyPDF2.PdfReader(pdf_path, "rb"), outline_item=True)
7474

7575
# File handle
7676
with open(pdf_path, "rb") as fh:
77-
file_merger.append(fh)
77+
merger.append(fh)
7878

79-
outline_item = file_merger.add_outline_item("An outline item", 0)
80-
file_merger.add_outline_item("deeper", 0, parent=outline_item)
81-
file_merger.add_metadata({"author": "Martin Thoma"})
82-
file_merger.add_named_destination("title", 0)
83-
file_merger.set_page_layout("/SinglePage")
84-
file_merger.set_page_mode("/UseThumbs")
79+
outline_item = merger.add_outline_item("An outline item", 0)
80+
merger.add_outline_item("deeper", 0, parent=outline_item)
81+
merger.add_metadata({"author": "Martin Thoma"})
82+
merger.add_named_destination("title", 0)
83+
merger.set_page_layout("/SinglePage")
84+
merger.set_page_mode("/UseThumbs")
8585

8686
tmp_path = "dont_commit_merged.pdf"
87-
file_merger.write(tmp_path)
88-
file_merger.close()
87+
merger.write(tmp_path)
88+
merger.close()
8989

9090
# Check if outline is correct
9191
reader = PyPDF2.PdfReader(tmp_path)

‎tests/test_encryption.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,15 @@ def test_get_page_of_encrypted_file_new_algorithm(pdffile, password):
135135
)
136136
@pytest.mark.skipif(not HAS_PYCRYPTODOME, reason="No pycryptodome")
137137
def test_encryption_merge(names):
138-
pdf_merger = PyPDF2.PdfMerger()
138+
merger = PyPDF2.PdfMerger()
139139
files = [RESOURCE_ROOT / "encryption" / x for x in names]
140140
pdfs = [PyPDF2.PdfReader(x) for x in files]
141141
for pdf in pdfs:
142142
if pdf.is_encrypted:
143143
pdf.decrypt("asdfzxcv")
144-
pdf_merger.append(pdf)
144+
merger.append(pdf)
145145
# no need to write to file
146-
pdf_merger.close()
146+
merger.close()
147147

148148

149149
@pytest.mark.parametrize(

‎tests/test_merger.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ def test_trim_outline_list():
221221
merger = PdfMerger()
222222
merger.append(reader)
223223
merger.write("tmp-merger-do-not-commit.pdf")
224+
merger.close()
224225

225226
# cleanup
226227
os.remove("tmp-merger-do-not-commit.pdf")
@@ -233,6 +234,7 @@ def test_zoom():
233234
merger = PdfMerger()
234235
merger.append(reader)
235236
merger.write("tmp-merger-do-not-commit.pdf")
237+
merger.close()
236238

237239
# cleanup
238240
os.remove("tmp-merger-do-not-commit.pdf")
@@ -245,6 +247,7 @@ def test_zoom_xyz_no_left():
245247
merger = PdfMerger()
246248
merger.append(reader)
247249
merger.write("tmp-merger-do-not-commit.pdf")
250+
merger.close()
248251

249252
# cleanup
250253
os.remove("tmp-merger-do-not-commit.pdf")
@@ -257,6 +260,7 @@ def test_outline_item():
257260
merger = PdfMerger()
258261
merger.append(reader)
259262
merger.write("tmp-merger-do-not-commit.pdf")
263+
merger.close()
260264

261265
# cleanup
262266
os.remove("tmp-merger-do-not-commit.pdf")
@@ -269,6 +273,7 @@ def test_trim_outline():
269273
merger = PdfMerger()
270274
merger.append(reader)
271275
merger.write("tmp-merger-do-not-commit.pdf")
276+
merger.close()
272277

273278
# cleanup
274279
os.remove("tmp-merger-do-not-commit.pdf")
@@ -281,6 +286,7 @@ def test1():
281286
merger = PdfMerger()
282287
merger.append(reader)
283288
merger.write("tmp-merger-do-not-commit.pdf")
289+
merger.close()
284290

285291
# cleanup
286292
os.remove("tmp-merger-do-not-commit.pdf")
@@ -294,6 +300,7 @@ def test_sweep_recursion1():
294300
merger = PdfMerger()
295301
merger.append(reader)
296302
merger.write("tmp-merger-do-not-commit.pdf")
303+
merger.close()
297304

298305
reader2 = PdfReader("tmp-merger-do-not-commit.pdf")
299306
reader2.pages
@@ -321,6 +328,7 @@ def test_sweep_recursion2(url, name):
321328
merger = PdfMerger()
322329
merger.append(reader)
323330
merger.write("tmp-merger-do-not-commit.pdf")
331+
merger.close()
324332

325333
reader2 = PdfReader("tmp-merger-do-not-commit.pdf")
326334
reader2.pages
@@ -336,6 +344,7 @@ def test_sweep_indirect_list_newobj_is_None(caplog):
336344
merger = PdfMerger()
337345
merger.append(reader)
338346
merger.write("tmp-merger-do-not-commit.pdf")
347+
merger.close()
339348
assert "Object 21 0 not defined." in caplog.text
340349

341350
reader2 = PdfReader("tmp-merger-do-not-commit.pdf")
@@ -351,6 +360,7 @@ def test_iss1145():
351360
name = "iss1145.pdf"
352361
merger = PdfMerger()
353362
merger.append(PdfReader(BytesIO(get_pdf_from_url(url, name=name))))
363+
merger.close()
354364

355365

356366
def test_deprecate_bookmark_decorator_warning():

0 commit comments

Comments
 (0)