diff --git a/scripts/wk/kit/tools.py b/scripts/wk/kit/tools.py index 5edd5f15..0d59cb81 100644 --- a/scripts/wk/kit/tools.py +++ b/scripts/wk/kit/tools.py @@ -60,8 +60,8 @@ def download_file(out_path, source_url, as_new=False, overwrite=False, referer=N try: sleep(1) response = session.get(source_url, allow_redirects=True, headers=headers, stream=True) - except requests.RequestException as _err: - download_failed = _err + except requests.RequestException as _err2: + download_failed = _err2 else: if not response.ok: download_failed = response diff --git a/scripts/wk/log.py b/scripts/wk/log.py index b69afb1f..dfa09127 100644 --- a/scripts/wk/log.py +++ b/scripts/wk/log.py @@ -41,6 +41,7 @@ def enable_debug_mode(): def format_log_path( log_dir=None, log_name=None, timestamp=False, kit=False, tool=False, append=False): + # pylint: disable=too-many-arguments """Format path based on args passed, returns pathlib.Path obj.""" log_path = pathlib.Path( f'{log_dir if log_dir else DEFAULT_LOG_DIR}/' diff --git a/scripts/wk/os/win.py b/scripts/wk/os/win.py index 187289ad..a7fa6118 100644 --- a/scripts/wk/os/win.py +++ b/scripts/wk/os/win.py @@ -180,7 +180,7 @@ def export_bitlocker_info(): file_path = pathlib.Path(f'../../Bitlocker_{file_name}.txt').resolve() # Save info - with open(file_path, 'a') as _f: + with open(file_path, 'a', encoding='utf-8') as _f: for cmd in commands: proc = run_program(cmd, check=False) _f.write(f'{proc.stdout}\n\n') diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py index 2fb22db3..01ffd56f 100644 --- a/scripts/wk/repairs/win.py +++ b/scripts/wk/repairs/win.py @@ -318,11 +318,10 @@ def init_session(options): set_timezone(WINDOWS_TIME_ZONE) # One-time tasks - if not session_started: - TRY_PRINT.run( - 'Run AVRemover...', run_tool, 'AVRemover', 'AVRemover', - download=True, msg_good='DONE', - ) + TRY_PRINT.run( + 'Run AVRemover...', run_tool, 'AVRemover', 'AVRemover', + download=True, msg_good='DONE', + ) if options['Run TDSSKiller (once)']['Selected']: TRY_PRINT.run('Running TDSSKiller...', run_tdsskiller, msg_good='DONE') print('') @@ -359,7 +358,7 @@ def is_session_started(): return session_started -def load_preset(menus, presets, title, enable_menu_exit=True): +def load_preset(menus, presets, enable_menu_exit=True): """Load menu settings from preset and ask selection question(s).""" if not enable_menu_exit: MENU_PRESETS.actions['Main Menu'].update({'Disabled':True, 'Hidden':True}) @@ -408,7 +407,7 @@ def run_auto_repairs(base_menus, presets): menus = build_menus(base_menus, title, presets) # Get repair preset - load_preset(menus, presets, title, enable_menu_exit=False) + load_preset(menus, presets, enable_menu_exit=False) # Init try: