additional uses of pathlib after merging with main

Author: bmos

docs/conf.py

@@ -12,7 +12,6 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use Path.absolute() to make it absolute, like shown here.
 #
-import os
 import sys
 from pathlib import Path
 

parsons/catalist/catalist.py

@@ -5,7 +5,6 @@
 
 import base64
 import logging
-import os
 import tempfile
 import time
 import urllib
@@ -380,15 +379,15 @@ def load_matches(self, id: str) -> Table:
         with ZipFile(temp_file_zip) as zf:
             zf.extractall(path=temp_dir)
 
-        filepath = os.listdir(temp_dir)[0]
+        filepath = next(Path(temp_dir).iterdir())
 
-        result = Table.from_csv(Path(temp_dir) / filepath, delimiter="\t")
+        result = Table.from_csv(str(filepath), delimiter="\t")
         return result
 
     def validate_table(self, table: Table, template_id: str = "48827") -> None:
         """Validate table structure and contents."""
         if not template_id == "48827":
-            logger.warn(f"No validator implemented for template {template_id}.")
+            logger.warning(f"No validator implemented for template {template_id}.")
             return
 
         expected_table_columns = [

parsons/databases/sqlite/sqlite.py

@@ -111,7 +111,7 @@ def query_with_connection(
             if return_values and cursor.description:
                 temp_file = files.create_temp_file()
 
-                with open(temp_file, "wb") as f:
+                with Path(temp_file).open(mode="wb") as f:
                     # Grab the header
                     header = [i[0] for i in cursor.description]
                     pickle.dump(header, f)

parsons/google/google_bigquery.py

@@ -849,7 +849,7 @@ def copy_direct(
         )
 
         tmpfile_path = tbl.to_csv()
-        with open(tmpfile_path, mode="rb") as tmpfile:
+        with Path(tmpfile_path).open(mode="rb") as tmpfile:
             load_job = self.client.load_table_from_file(
                 tmpfile,
                 destination=self.get_table_ref(table_name=table_name),

test/test_catalist/conftest.py

@@ -40,7 +40,7 @@ def mock_miscellaneous(mocker) -> Generator[MagicMock, None, None]:
     magic_mock = MagicMock()
 
     mocker.patch("parsons.catalist.catalist.ZipFile", new=magic_mock)
-    mocker.patch("parsons.catalist.catalist.os", new=magic_mock)
+    mocker.patch("parsons.catalist.catalist.Path", new=magic_mock)
     mocker.patch("parsons.catalist.catalist.Table", new=magic_mock)
 
     yield mocker

test/test_scytl/test_scytl.py

@@ -1,5 +1,4 @@
 import csv
-import os
 import unittest
 from pathlib import Path
 
@@ -198,9 +197,9 @@ def _mock_responses(self, m: requests_mock.Mocker):
             text=(_DIR / "GA_114729_296262_county_election_settings.json").read_text(),
         )
 
-        for file in os.listdir(_DIR / "mock_responses"):
-            file_url = f"https://results.enr.clarityelections.com/{file}".replace("_", "/")
-            m.get(file_url, content=Path(_DIR / "mock_responses" / file).read_bytes())
+        for file in (_DIR / "mock_responses").iterdir():
+            file_url = f"https://results.enr.clarityelections.com/{file.name}".replace("_", "/")
+            m.get(file_url, content=file.read_bytes())
 
         mock_summary_csv_url = scytl.SUMMARY_CSV_ZIP_URL_TEMPLATE.format(
             administrator=TEST_STATE,