Updates after reviewer comments

salt/utils/platform.py

@@ -13,8 +13,6 @@ import distro
 
 from salt.utils.decorators import memoize as real_memoize
 
-## from salt.utils.files import fopen as _fopen
-
 
 def linux_distribution(full_distribution_name=True):
     """
@@ -255,7 +253,6 @@ def get_machine_identifier():
     if not existing_locations:
         return {}
     else:
-        ## with _fopen(existing_locations[0]) as machineid:
         # cannot use salt.utils.files.fopen due to circular dependency
         with open(
             existing_locations[0], encoding=__salt_system_encoding__

salt/utils/process.py

@@ -13,6 +13,7 @@ import logging
 import multiprocessing
 import multiprocessing.util
 import os
+import pathlib
 import queue
 import shutil
 import signal
@@ -21,7 +22,6 @@ import subprocess
 import sys
 import threading
 import time
-from pathlib import Path
 
 import salt._logging
 import salt.defaults.exitcodes
@@ -1106,7 +1106,7 @@ class SignalHandlingProcess(Process):
                 if cache_dir and gitfs_active:
                     # check for gitfs file locks to ensure no resource leaks
                     # last chance to clean up any missed unlock droppings
-                    cache_dir = Path(cache_dir + "/gitfs/work")
+                    cache_dir = pathlib.Path(cache_dir + "/gitfs/work")
                     if cache_dir.exists and cache_dir.is_dir():
                         file_list = list(cache_dir.glob("**/*.lk"))
                         file_del_list = []

tests/pytests/unit/utils/test_gitfs_locks.py

@@ -28,7 +28,7 @@ try:
 except ImportError:
     import salt.utils.win_functions
 
-pytestmark = [pytest.mark.skip_unless_on_linux]
+pytestmark = [pytest.mark.skip_on_windows]
 
 log = logging.getLogger(__name__)