From 22b410d082e1dc0f9bd1a10a567bfdc5ab626b99 Mon Sep 17 00:00:00 2001
From: codefiles <11915375+codefiles@users.noreply.github.com>
Date: Fri, 10 Jan 2025 23:42:50 -0500
Subject: [PATCH] Change to import Path for consistency (#3101)

---
 archinstall/__main__.py                      |  4 ++--
 archinstall/lib/general.py                   | 12 ++++++------
 archinstall/lib/interactions/general_conf.py |  4 ++--
 archinstall/scripts/list.py                  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/archinstall/__main__.py b/archinstall/__main__.py
index 174d1c87..da5c36bd 100644
--- a/archinstall/__main__.py
+++ b/archinstall/__main__.py
@@ -1,9 +1,9 @@
 import importlib
-import pathlib
 import sys
+from pathlib import Path
 
 # Load .git version before the builtin version
-if pathlib.Path('./archinstall/__init__.py').absolute().exists():
+if Path('./archinstall/__init__.py').absolute().exists():
 	spec = importlib.util.spec_from_file_location("archinstall", "./archinstall/__init__.py")
 
 	if spec is None or spec.loader is None:
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index eb223bd0..1a96ef7e 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import json
 import os
-import pathlib
 import re
 import secrets
 import shlex
@@ -16,6 +15,7 @@ import urllib.parse
 from collections.abc import Callable, Iterator
 from datetime import date, datetime
 from enum import Enum
+from pathlib import Path
 from select import EPOLLHUP, EPOLLIN, epoll
 from shutil import which
 from typing import TYPE_CHECKING, Any, override
@@ -73,7 +73,7 @@ def jsonify(obj: Any, safe: bool = True) -> Any:
 		return obj.isoformat()
 	if isinstance(obj, list | set | tuple):
 		return [jsonify(item, safe) for item in obj]
-	if isinstance(obj, pathlib.Path):
+	if isinstance(obj, Path):
 		return str(obj)
 	if hasattr(obj, "__dict__"):
 		return vars(obj)
@@ -116,7 +116,7 @@ class SysCommandWorker:
 			cmd = shlex.split(cmd)
 
 		if cmd:
-			if cmd[0][0] != '/' and cmd[0][:2] != './':  # pathlib.Path does not work well
+			if cmd[0][0] != '/' and cmd[0][:2] != './':  # Path() does not work well
 				cmd[0] = locate_binary(cmd[0])
 
 		self.cmd = cmd
@@ -245,7 +245,7 @@ class SysCommandWorker:
 				except UnicodeDecodeError:
 					return False
 
-			peak_logfile = pathlib.Path(f"{storage['LOG_PATH']}/cmd_output.txt")
+			peak_logfile = Path(f"{storage['LOG_PATH']}/cmd_output.txt")
 
 			change_perm = False
 			if peak_logfile.exists() is False:
@@ -304,7 +304,7 @@ class SysCommandWorker:
 
 		# https://stackoverflow.com/questions/4022600/python-pty-fork-how-does-it-work
 		if not self.pid:
-			history_logfile = pathlib.Path(f"{storage['LOG_PATH']}/cmd_history.txt")
+			history_logfile = Path(f"{storage['LOG_PATH']}/cmd_history.txt")
 
 			change_perm = False
 			if history_logfile.exists() is False:
@@ -496,7 +496,7 @@ def json_stream_to_structure(configuration_identifier: str, stream: str, target:
 			return False
 
 	# Try using the stream as a filepath that should be read
-	if raw is None and (path := pathlib.Path(stream)).exists():
+	if raw is None and (path := Path(stream)).exists():
 		try:
 			raw = path.read_text()
 		except Exception as err:
diff --git a/archinstall/lib/interactions/general_conf.py b/archinstall/lib/interactions/general_conf.py
index 341049f7..17bdb152 100644
--- a/archinstall/lib/interactions/general_conf.py
+++ b/archinstall/lib/interactions/general_conf.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import pathlib
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 from archinstall.tui import Alignment, EditMenu, FrameProperties, MenuItem, MenuItemGroup, Orientation, ResultType, SelectMenu, Tui
@@ -243,7 +243,7 @@ def add_number_of_parallel_downloads(preset: int | None = None) -> int | None:
 		case ResultType.Selection:
 			downloads: int = int(result.text())
 
-	pacman_conf_path = pathlib.Path("/etc/pacman.conf")
+	pacman_conf_path = Path("/etc/pacman.conf")
 	with pacman_conf_path.open() as f:
 		pacman_conf = f.read().split("\n")
 
diff --git a/archinstall/scripts/list.py b/archinstall/scripts/list.py
index 0b9a0d1d..7d9408c3 100644
--- a/archinstall/scripts/list.py
+++ b/archinstall/scripts/list.py
@@ -1,9 +1,9 @@
 import glob
-import pathlib
+from pathlib import Path
 
 print("The following are viable --script options:")
 
-for script in [pathlib.Path(x) for x in glob.glob(f"{pathlib.Path(__file__).parent}/*.py")]:
+for script in [Path(x) for x in glob.glob(f"{Path(__file__).parent}/*.py")]:
 	if script.stem in ['__init__', 'list']:
 		continue