Merge branch 'master' of ssh://code.g-r-l.com/generalresearch

2 files changed, 6 insertions, 7 deletions

diff --git a/test_utils/managers/ledger/conftest.py b/test_utils/managers/ledger/conftest.py
index c66ee4e..0aa6cb3 100644
--- a/test_utils/managers/ledger/conftest.py
+++ b/test_utils/managers/ledger/conftest.py
@@ -586,7 +586,6 @@ def session_with_tx_factory(
 ) -> Callable[..., "Session"]:
 
     from generalresearch.models.thl.session import (
-        Session,
         Status,
         StatusCode1,
     )
@@ -661,7 +660,7 @@ def adj_to_fail_with_tx_factory(
         # This is defined in `thl-grpc/thl/user_quality_history/recons.py:150`
         #   so we can't use it as part of this test anyway to add rows to the
         #   thl_taskadjustment table anyway.. until we created a
-        #   TaskAdjustment Manager to put into py-utils!
+        #   TaskAdjustment Manager to put into generalresearch!
 
         # create_task_adjustment_event(
         #     wall,
diff --git a/test_utils/managers/network/conftest.py b/test_utils/managers/network/conftest.py
index 979dd63..6c5ea23 100644
--- a/test_utils/managers/network/conftest.py
+++ b/test_utils/managers/network/conftest.py
@@ -1,5 +1,5 @@
 import os
-from datetime import timedelta, datetime, timezone
+from datetime import datetime, timedelta, timezone
 from uuid import uuid4
 
 import pytest
@@ -10,13 +10,13 @@ from generalresearch.models.network.definitions import IPProtocol
 from generalresearch.models.network.mtr.parser import parse_mtr_output
 from generalresearch.models.network.nmap.parser import parse_nmap_xml
 from generalresearch.models.network.rdns.parser import parse_rdns_output
-from generalresearch.models.network.tool_run import NmapRun, Status, RDNSRun, MTRRun
+from generalresearch.models.network.tool_run import MTRRun, NmapRun, RDNSRun, Status
 from generalresearch.models.network.tool_run_command import (
     MTRRunCommand,
     MTRRunCommandOptions,
-    RDNSRunCommand,
     NmapRunCommand,
     NmapRunCommandOptions,
+    RDNSRunCommand,
     RDNSRunCommandOptions,
 )
 
@@ -43,7 +43,7 @@ def toolrun_manager(thl_web_rw) -> ToolRunManager:
 @pytest.fixture(scope="session")
 def nmap_raw_output(request) -> str:
     fp = os.path.join(request.config.rootpath, "data/nmaprun1.xml")
-    with open(fp, "r") as f:
+    with open(fp) as f:
         data = f.read()
     return data
 
@@ -107,7 +107,7 @@ def rdns_run(rdns_result, scan_group_id):
 @pytest.fixture(scope="session")
 def mtr_raw_output(request):
     fp = os.path.join(request.config.rootpath, "data/mtr_fatbeam.json")
-    with open(fp, "r") as f:
+    with open(fp) as f:
         data = f.read()
     return data