Merge remote-tracking branch 'upstream/dev' into dev

.bin/Scripts/functions/json.py

@@ -6,7 +6,7 @@ from functions.common import *
 
 def get_json_from_command(cmd, ignore_errors=True):
   """Capture JSON content from cmd output, returns dict.
-  
+
   If the data can't be decoded then either an exception is raised
   or an empty dict is returned depending on ignore_errors.
   """
@@ -22,7 +22,7 @@ def get_json_from_command(cmd, ignore_errors=True):
   except (subprocess.CalledProcessError, json.decoder.JSONDecodeError):
     if not ignore_errors:
       raise
-  
+
   return json_data
 
 

.bin/Scripts/settings/browsers.py

@@ -1,5 +1,6 @@
 # Wizard Kit: Settings - Browsers
 
+import os
 import re
 
 # General

.bin/Scripts/settings/data.py

@@ -3,6 +3,8 @@
 import ctypes
 import re
 
+from settings.main import *
+
 # FastCopy
 FAST_COPY_EXCLUDES = [
   r'\*.esd',

.bin/Scripts/settings/setup.py

@@ -1,5 +1,7 @@
 # Wizard Kit: Settings - Setup
 
+import winreg
+
 # General
 HKU =  winreg.HKEY_USERS
 HKCR = winreg.HKEY_CLASSES_ROOT

.bin/Scripts/settings/winpe.py

@@ -1,5 +1,18 @@
 # Wizard Kit: Settings - WinPE
 
+from settings.data import *
+
+# FastCopy
+FAST_COPY_PE_ARGS = [
+  '/cmd=noexist_only',
+  '/utf8',
+  '/skip_empty_dir',
+  '/linkdest',
+  '/no_ui',
+  '/auto_close',
+  '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
+  ]
+
 # General
 PE_TOOLS = {
   'BlueScreenView': {
@@ -37,17 +50,6 @@ PE_TOOLS = {
     },
   }
 
-# FastCopy
-FAST_COPY_PE_ARGS = [
-  '/cmd=noexist_only',
-  '/utf8',
-  '/skip_empty_dir',
-  '/linkdest',
-  '/no_ui',
-  '/auto_close',
-  '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
-  ]
-
 
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")