Updated functions.cleanup

.bin/Scripts/functions/cleanup.py

@@ -71,6 +71,7 @@ def cleanup_cbs(dest_folder):
 
 
 def cleanup_d7ii():
+  # pylint: disable=too-many-branches
   """Sort d7II logs and remove temp items."""
   d7_path = r'{}\d7II'.format(global_vars['ClientDir'])
   d7_reports = r'{} Reports'.format(d7_path)
@@ -79,9 +80,9 @@ def cleanup_d7ii():
   # Logs & Reports
   if os.path.exists(d7_reports):
     for entry in os.scandir(d7_reports):
-      r = re.match(r'(\d+)-(\d+)-(\d+)', entry.name)
+      _r = re.match(r'(\d+)-(\d+)-(\d+)', entry.name)
       d7_date = '{}-{:02d}-{:02d}'.format(
-        r.group(1), int(r.group(2)), int(r.group(3)))
+        _r.group(1), int(_r.group(2)), int(_r.group(3)))
       d7_mlogs = r'{}\Malware Logs'.format(entry.path)
       log_dest = r'{SYSTEMDRIVE}\{prefix}\Logs\{date}'.format(
         prefix=KIT_NAME_SHORT,
@@ -139,13 +140,9 @@ def cleanup_d7ii():
       os.rmdir(d7_path)
     except OSError:
       pass
-  
+
   # Restore default UAC settings
-  if global_vars['OS']['Version'] == '10':
-    write_registry_settings(UAC_DEFAULTS_WIN10, all_users=True)
-  else:
-    # Haven't checked Win8 settings, only applying minimum set
-    write_registry_settings(UAC_DEFAULTS_WIN7, all_users=True)
+  restore_default_uac()
 
 def cleanup_desktop():
   """Move known backup files and reports into the ClientDir."""
@@ -230,7 +227,7 @@ def delete_registry_key(hive, key, recurse=False):
       # Delete all subkeys first
       with winreg.OpenKeyEx(hive, key, 0, access) as k:
         key_info = winreg.QueryInfoKey(k)
-        for x in range(key_info[0]):
+        for _i in range(key_info[0]): # pylint: disable=unused-variable
           subkey = r'{}\{}'.format(key, winreg.EnumKey(k, 0))
           delete_registry_key(hive, subkey)