Merge pull request #447 from dylanmtaylor/formatting

Very selectively fix some PEP 8 issues and other manual formatting changes

1 files changed, 41 insertions, 28 deletions

diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
index 009a3a6c..9eaff22e 100644
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@@ -1,20 +1,23 @@
-import os, subprocess, json
-from .general import sys_command
-from .networking import list_interfaces, enrichIfaceTypes
+import json
+import os
+import subprocess
 from typing import Optional
 
+from .general import sys_command
+from .networking import list_interfaces, enrich_iface_types
+
 __packages__ = [
-		"mesa",
-		"xf86-video-amdgpu",
-		"xf86-video-ati",
-		"xf86-video-nouveau",
-		"xf86-video-vmware",
-		"libva-mesa-driver",
-		"libva-intel-driver",
-		"intel-media-driver",
-		"vulkan-radeon",
-		"vulkan-intel",
-		"nvidia",
+	"mesa",
+	"xf86-video-amdgpu",
+	"xf86-video-ati",
+	"xf86-video-nouveau",
+	"xf86-video-vmware",
+	"libva-mesa-driver",
+	"libva-intel-driver",
+	"intel-media-driver",
+	"vulkan-radeon",
+	"vulkan-intel",
+	"nvidia",
 ]
 
 AVAILABLE_GFX_DRIVERS = {
@@ -52,47 +55,57 @@ AVAILABLE_GFX_DRIVERS = {
 	"VMware / VirtualBox (open-source)": ["mesa", "xf86-video-vmware"],
 }
 
-def hasWifi()->bool:
-	return 'WIRELESS' in enrichIfaceTypes(list_interfaces().values()).values()
 
-def hasAMDCPU()->bool:
+def hasWifi() -> bool:
+	return 'WIRELESS' in enrich_iface_types(list_interfaces().values()).values()
+
+
+def hasAMDCPU() -> bool:
 	if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode():
 		return True
 	return False
-def hasIntelCPU()->bool:
+
+
+def hasIntelCPU() -> bool:
 	if subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode():
 		return True
 	return False
 
-def hasUEFI()->bool:
+
+def hasUEFI() -> bool:
 	return os.path.isdir('/sys/firmware/efi')
 
-def graphicsDevices()->dict:
+
+def graphicsDevices() -> dict:
 	cards = {}
 	for line in sys_command(f"lspci"):
 		if b' VGA ' in line:
-			_, identifier = line.split(b': ',1)
+			_, identifier = line.split(b': ', 1)
 			cards[identifier.strip().lower().decode('UTF-8')] = line
 	return cards
 
-def hasNvidiaGraphics()->bool:
+
+def hasNvidiaGraphics() -> bool:
 	return any('nvidia' in x for x in graphicsDevices())
 
-def hasAmdGraphics()->bool:
+
+def hasAmdGraphics() -> bool:
 	return any('amd' in x for x in graphicsDevices())
 
-def hasIntelGraphics()->bool:
+
+def hasIntelGraphics() -> bool:
 	return any('intel' in x for x in graphicsDevices())
 
 
-def cpuVendor()-> Optional[str]:
+def cpuVendor() -> Optional[str]:
 	cpu_info = json.loads(subprocess.check_output("lscpu -J", shell=True).decode('utf-8'))['lscpu']
 	for info in cpu_info:
-		if info.get('field',None):
-			if info.get('field',None) == "Vendor ID:":
-				return info.get('data',None)
+		if info.get('field', None):
+			if info.get('field', None) == "Vendor ID:":
+				return info.get('data', None)
 	return None
 
+
 def isVM() -> bool:
 	try:
 		subprocess.check_call(["systemd-detect-virt"]) # systemd-detect-virt issues a non-zero exit code if it is not on a virtual machine