Adjust Windows-specific imports and STATIC VARS

This commit is contained in:
2Shirt 2021-09-28 18:34:50 -06:00
parent 90fb97ad91
commit f0451a9803
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 67 additions and 51 deletions

View file

@ -32,17 +32,6 @@ from wk.kit.tools import (
run_tool,
)
from wk.log import format_log_path, update_log_path
from wk.os.win import (
get_timezone,
set_timezone,
reg_delete_value,
reg_read_value,
reg_set_value,
reg_write_settings,
disable_service,
enable_service,
stop_service,
)
from wk.std import (
GenericError,
GenericWarning,
@ -61,6 +50,32 @@ from wk.std import (
sleep,
strip_colors,
)
if platform.system() == 'Windows':
from wk.os.win import (
get_timezone,
set_timezone,
reg_delete_value,
reg_read_value,
reg_set_value,
reg_write_settings,
disable_service,
enable_service,
stop_service,
)
else:
# Workaround to allow basic testing under non-Windows environments
def no_op(*args, **kwargs): # pylint: disable=unused-argument
"""No-op function."""
# wk.os.win
get_timezone = no_op
set_timezone = no_op
reg_delete_value = no_op
reg_read_value = no_op
reg_set_value = no_op
reg_write_settings = no_op
disable_service = no_op
enable_service = no_op
stop_service = no_op
# STATIC VARIABLES
@ -118,7 +133,9 @@ PROGRAMFILES_32 = os.environ.get(
'PROGRAMFILES', r'C:\Program Files (x86)',
),
)
OS_VERSION = float(platform.win32_ver()[0])
OS_VERSION = -1
if platform.system() == 'Windows':
OS_VERSION = float(platform.win32_ver()[0])
POWER_PLANS = {
'Balanced': '381b4222-f694-41f0-9685-ff5bb260df2e',
'Custom': '01189998-8199-9119-725c-ccccccccccc3',

View file

@ -8,25 +8,10 @@ import os
import platform
import re
import sys
import time
from subprocess import CalledProcessError, DEVNULL
from wk.cfg.main import KIT_NAME_FULL, KIT_NAME_SHORT
from wk.exe import (
get_procs,
kill_procs,
run_program,
popen_program,
wait_for_procs,
)
from wk.io import (
case_insensitive_path,
delete_folder,
get_path_obj,
non_clobber_path,
rename_item,
)
from wk.cfg.main import KIT_NAME_FULL
from wk.exe import kill_procs, run_program, popen_program
from wk.io import case_insensitive_path, get_path_obj
from wk.kit.tools import (
ARCH,
download_tool,
@ -37,28 +22,7 @@ from wk.kit.tools import (
run_tool,
)
from wk.log import format_log_path, update_log_path
from wk.os.win import (
activate_with_bios,
reg_delete_value,
reg_read_value,
reg_set_value,
reg_write_settings,
disable_service,
enable_service,
stop_service,
)
from wk.repairs.win import (
backup_all_browser_profiles,
backup_registry,
create_custom_power_plan,
create_system_restore_point,
enable_windows_updates,
export_power_plans,
reset_power_plans,
set_system_restore_size,
)
from wk.std import (
GenericError,
GenericWarning,
Menu,
TryAndPrint,
@ -75,6 +39,41 @@ from wk.std import (
sleep,
strip_colors,
)
if platform.system() == 'Windows':
from wk.os.win import (
activate_with_bios,
reg_read_value,
reg_set_value,
reg_write_settings,
)
from wk.repairs.win import (
backup_all_browser_profiles,
backup_registry,
create_custom_power_plan,
create_system_restore_point,
enable_windows_updates,
export_power_plans,
reset_power_plans,
set_system_restore_size,
)
else:
# Workaround to allow basic testing under non-Windows environments
def no_op(*args, **kwargs): # pylint: disable=unused-argument
"""No-op function."""
# wk.os.win
activate_with_bios = no_op
reg_read_value = no_op
reg_set_value = no_op
reg_write_settings = no_op
# wk.repairs.win
backup_all_browser_profiles = no_op
backup_registry = no_op
create_custom_power_plan = no_op
create_system_restore_point = no_op
enable_windows_updates = no_op
export_power_plans = no_op
reset_power_plans = no_op
set_system_restore_size = no_op
# STATIC VARIABLES