diff --git a/tests/bench.py b/tests/bench.py index dcb22f278..5072510cf 100644 --- a/tests/bench.py +++ b/tests/bench.py @@ -1,17 +1,18 @@ import os +from pathlib import Path import PyPDF2 from PyPDF2 import PdfReader, Transformation from PyPDF2.generic import Destination -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = os.path.dirname(TESTS_ROOT) -RESOURCE_ROOT = os.path.join(PROJECT_ROOT, "resources") -SAMPLE_ROOT = os.path.join(PROJECT_ROOT, "sample-files") +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent +RESOURCE_ROOT = PROJECT_ROOT / "resources" +SAMPLE_ROOT = PROJECT_ROOT / "sample-files" def page_ops(pdf_path, password): - pdf_path = os.path.join(RESOURCE_ROOT, pdf_path) + pdf_path = RESOURCE_ROOT / pdf_path reader = PdfReader(pdf_path) @@ -50,10 +51,10 @@ def test_page_operations(benchmark): def merge(): - pdf_path = os.path.join(RESOURCE_ROOT, "crazyones.pdf") - outline = os.path.join(RESOURCE_ROOT, "pdflatex-outline.pdf") - pdf_forms = os.path.join(RESOURCE_ROOT, "pdflatex-forms.pdf") - pdf_pw = os.path.join(RESOURCE_ROOT, "libreoffice-writer-password.pdf") + pdf_path = RESOURCE_ROOT / "crazyones.pdf" + outline = RESOURCE_ROOT / "pdflatex-outline.pdf" + pdf_forms = RESOURCE_ROOT / "pdflatex-forms.pdf" + pdf_pw = RESOURCE_ROOT / "libreoffice-writer-password.pdf" file_merger = PyPDF2.PdfMerger() @@ -126,5 +127,5 @@ def text_extraction(pdf_path): def test_text_extraction(benchmark): - file_path = os.path.join(SAMPLE_ROOT, "009-pdflatex-geotopo/GeoTopo.pdf") + file_path = SAMPLE_ROOT / "009-pdflatex-geotopo/GeoTopo.pdf" benchmark(text_extraction, file_path) diff --git a/tests/test_basic_features.py b/tests/test_basic_features.py index 9e85d64fa..bdc65d074 100644 --- a/tests/test_basic_features.py +++ b/tests/test_basic_features.py @@ -3,8 +3,8 @@ from PyPDF2 import PdfReader, PdfWriter -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" diff --git a/tests/test_encryption.py b/tests/test_encryption.py index c2238e443..90c3ff4f7 100644 --- a/tests/test_encryption.py +++ b/tests/test_encryption.py @@ -1,4 +1,3 @@ -import os from pathlib import Path import pytest @@ -15,8 +14,8 @@ except ImportError: HAS_PYCRYPTODOME = False -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" diff --git a/tests/test_generic.py b/tests/test_generic.py index 753100dd0..0ed2ee7d1 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -34,8 +34,8 @@ from . import get_pdf_from_url -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" diff --git a/tests/test_javascript.py b/tests/test_javascript.py index 97fecee0a..a63f0e47d 100644 --- a/tests/test_javascript.py +++ b/tests/test_javascript.py @@ -1,4 +1,3 @@ -import os from pathlib import Path import pytest @@ -6,8 +5,8 @@ from PyPDF2 import PdfReader, PdfWriter # Configure path environment -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" diff --git a/tests/test_merger.py b/tests/test_merger.py index f53c429c4..f4cf78179 100644 --- a/tests/test_merger.py +++ b/tests/test_merger.py @@ -11,8 +11,8 @@ from . import get_pdf_from_url -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" sys.path.append(str(PROJECT_ROOT)) diff --git a/tests/test_page.py b/tests/test_page.py index d3e5814b4..3e7caa33b 100644 --- a/tests/test_page.py +++ b/tests/test_page.py @@ -22,8 +22,8 @@ from . import get_pdf_from_url, normalize_warnings -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" EXTERNAL_ROOT = PROJECT_ROOT / "sample-files" diff --git a/tests/test_reader.py b/tests/test_reader.py index 6dd7d52b7..4dcf38020 100644 --- a/tests/test_reader.py +++ b/tests/test_reader.py @@ -24,8 +24,8 @@ except ImportError: HAS_PYCRYPTODOME = False -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" EXTERNAL_ROOT = PROJECT_ROOT / "sample-files" diff --git a/tests/test_utils.py b/tests/test_utils.py index cb77f6bef..954ae9d34 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -18,8 +18,8 @@ ) from PyPDF2.errors import PdfStreamError -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" diff --git a/tests/test_workflows.py b/tests/test_workflows.py index 393c84122..cbbf614f3 100644 --- a/tests/test_workflows.py +++ b/tests/test_workflows.py @@ -16,8 +16,8 @@ from . import get_pdf_from_url, normalize_warnings -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" sys.path.append(str(PROJECT_ROOT)) diff --git a/tests/test_writer.py b/tests/test_writer.py index 02d4e011e..0d78010ff 100644 --- a/tests/test_writer.py +++ b/tests/test_writer.py @@ -10,8 +10,8 @@ from . import get_pdf_from_url -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources" diff --git a/tests/test_xmp.py b/tests/test_xmp.py index 9d8c7be0e..a53b27b0e 100644 --- a/tests/test_xmp.py +++ b/tests/test_xmp.py @@ -1,4 +1,3 @@ -import os from datetime import datetime from io import BytesIO from pathlib import Path @@ -12,8 +11,8 @@ from . import get_pdf_from_url -TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) -PROJECT_ROOT = Path(os.path.dirname(TESTS_ROOT)) +TESTS_ROOT = Path(__file__).parent.resolve() +PROJECT_ROOT = TESTS_ROOT.parent RESOURCE_ROOT = PROJECT_ROOT / "resources"