Replace more os.path usages with pathlib

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)

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"
 
 

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"
 
 

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"
 
 

tests/test_javascript.py

@@ -1,13 +1,12 @@
-import os
 from pathlib import Path
 
 import pytest
 
 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"
 
 

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))

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"
 

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"
 

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"
 
 

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))

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"
 
 

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"