Revert "Minor improvements (#3102)"

[koplo199]

This reverts commit 38cad2d.

See #3109, it has issues beyond the health checks being broken.
Fixes #3108

[fab-sonarqube]

SonarQube Quality Gate

0 Bugs
0 Vulnerabilities
0 Security Hotspots
2 Code Smells

0.0% Coverage
0.0% Duplication

[github-actions]

Pylint result on modfied files:

************* Module bottles.backend.health
bottles/backend/health.py:222:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/health.py:224:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/health.py:226:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/health.py:81:12: C0103: Attribute name "ImageMagick" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/health.py:82:12: C0103: Attribute name "FVS" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/health.py:143:12: C0415: Import outside toplevel (icoextract) (import-outside-toplevel)
bottles/backend/health.py:143:12: W0611: Unused import icoextract (unused-import)
bottles/backend/health.py:151:12: C0415: Import outside toplevel (pefile) (import-outside-toplevel)
bottles/backend/health.py:151:12: W0611: Unused import pefile (unused-import)
bottles/backend/health.py:159:12: C0415: Import outside toplevel (markdown) (import-outside-toplevel)
bottles/backend/health.py:159:12: W0611: Unused import markdown (unused-import)
bottles/backend/health.py:167:12: C0415: Import outside toplevel (orjson) (import-outside-toplevel)
bottles/backend/health.py:167:12: W0611: Unused import orjson (unused-import)
bottles/backend/health.py:180:4: C0103: Method name "check_ImageMagick" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/health.py:187:4: C0103: Method name "check_FVS" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/health.py:189:12: C0415: Import outside toplevel (fvs.repo.FVSRepo) (import-outside-toplevel)
bottles/backend/health.py:189:12: W0611: Unused FVSRepo imported from fvs.repo (unused-import)
bottles/backend/health.py:195:4: R1710: Either all return statements in a function should return an expression, or none of them should. (inconsistent-return-statements)
bottles/backend/health.py:222:17: W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
bottles/backend/health.py:274:15: C0103: Variable name "v" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/health.py:33:0: R0904: Too many public methods (21/20) (too-many-public-methods)
bottles/backend/health.py:20:0: C0411: standard import "import shutil" should be placed before "from bottles.backend.utils import yaml" (wrong-import-order)
bottles/backend/health.py:21:0: C0411: standard import "import contextlib" should be placed before "from bottles.backend.utils import yaml" (wrong-import-order)
************* Module bottles.frontend.views.bottle_preferences
bottles/frontend/views/bottle_preferences.py:1:0: C0302: Too many lines in module (1125/1000) (too-many-lines)
bottles/frontend/views/bottle_preferences.py:440:13: W0511: "vista": "Windows Vista", # TODO: implement this in the backend (fixme)
bottles/frontend/views/bottle_preferences.py:55:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:57:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:146:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:147:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:148:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:149:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:150:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:152:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:153:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:154:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:155:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:156:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:157:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:158:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:159:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:160:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:161:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:162:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:163:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:164:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:165:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:166:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:167:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:168:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:169:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:180:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:184:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/views/bottle_preferences.py:23:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/views/bottle_preferences.py:172:8: W0105: String statement has no effect (pointless-string-statement)
bottles/frontend/views/bottle_preferences.py:177:8: W0105: String statement has no effect (pointless-string-statement)
bottles/frontend/views/bottle_preferences.py:186:8: W0105: String statement has no effect (pointless-string-statement)
bottles/frontend/views/bottle_preferences.py:272:8: W0212: Access to a protected member __library of a client class (protected-access)
bottles/frontend/views/bottle_preferences.py:285:25: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:344:12: W0612: Unused variable 'index' (unused-variable)
bottles/frontend/views/bottle_preferences.py:525:40: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:532:39: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:539:34: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:557:48: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:564:38: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:571:28: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:578:43: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:586:38: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:614:32: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:623:30: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:632:32: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:641:27: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:650:29: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:670:32: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:679:33: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:688:31: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:697:31: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:706:37: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:715:36: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:724:46: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:754:39: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:763:43: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:772:31: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:785:16: C0103: Variable name "w" doesn't conform to snake_case naming style (invalid-name)
bottles/frontend/views/bottle_preferences.py:801:41: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:840:0: W0613: Unused argument 'args' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1014:19: W0613: Unused argument 'result' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1014:27: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1024:8: C0103: Variable name "rk" doesn't conform to snake_case naming style (invalid-name)
bottles/frontend/views/bottle_preferences.py:1051:40: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1060:30: W0613: Unused argument 'status' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1060:43: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1072:31: W0613: Unused argument 'status' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1072:44: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1084:31: W0613: Unused argument 'status' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1084:44: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1101:37: W0613: Unused argument 'status' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1101:50: W0613: Unused argument 'error' (unused-argument)
bottles/frontend/views/bottle_preferences.py:1114:17: R1719: The if expression can be replaced with 'not test' (simplifiable-if-expression)
bottles/frontend/views/bottle_preferences.py:1116:12: C0103: Variable name "w" doesn't conform to snake_case naming style (invalid-name)
bottles/frontend/views/bottle_preferences.py:272:8: W0238: Unused private member `PreferencesView.__library` (unused-private-member)
bottles/frontend/views/bottle_preferences.py:247:16: W0201: Attribute '__valid_name' defined outside __init__ (attribute-defined-outside-init)
bottles/frontend/views/bottle_preferences.py:250:8: W0201: Attribute '__valid_name' defined outside __init__ (attribute-defined-outside-init)
bottles/frontend/views/bottle_preferences.py:256:12: W0201: Attribute '__valid_name' defined outside __init__ (attribute-defined-outside-init)
bottles/frontend/views/bottle_preferences.py:433:8: W0201: Attribute 'windows_versions' defined outside __init__ (attribute-defined-outside-init)
************* Module bottles.frontend.windows.envvars
bottles/frontend/windows/envvars.py:23:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/envvars.py:25:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/envvars.py:74:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/envvars.py:76:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/envvars.py:114:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/envvars.py:18:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/windows/envvars.py:24:0: R0903: Too few public methods (0/2) (too-few-public-methods)
bottles/frontend/windows/envvars.py:99:8: W0201: Attribute '__valid_name' defined outside __init__ (attribute-defined-outside-init)
bottles/frontend/windows/envvars.py:109:12: W0201: Attribute '__valid_name' defined outside __init__ (attribute-defined-outside-init)
bottles/frontend/windows/envvars.py:75:0: R0903: Too few public methods (0/2) (too-few-public-methods)
************* Module bottles.frontend.windows.fsr
bottles/frontend/windows/fsr.py:85:0: C0305: Trailing newlines (trailing-newlines)
bottles/frontend/windows/fsr.py:24:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/fsr.py:26:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/fsr.py:18:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/windows/fsr.py:73:8: C0206: Consider iterating with .items() (consider-using-dict-items)
bottles/frontend/windows/fsr.py:73:23: C0201: Consider iterating the dictionary directly instead of calling .keys() (consider-iterating-dictionary)
bottles/frontend/windows/fsr.py:25:0: R0903: Too few public methods (0/2) (too-few-public-methods)
************* Module bottles.frontend.windows.dlloverrides
bottles/frontend/windows/dlloverrides.py:21:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/dlloverrides.py:23:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/dlloverrides.py:49:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/dlloverrides.py:80:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/dlloverrides.py:82:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/dlloverrides.py:18:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/windows/dlloverrides.py:22:0: R0903: Too few public methods (0/2) (too-few-public-methods)
bottles/frontend/windows/dlloverrides.py:81:0: R0903: Too few public methods (0/2) (too-few-public-methods)
************* Module bottles.frontend.windows.exclusionpatterns
bottles/frontend/windows/exclusionpatterns.py:21:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/exclusionpatterns.py:23:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/exclusionpatterns.py:60:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/exclusionpatterns.py:62:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/exclusionpatterns.py:18:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/windows/exclusionpatterns.py:22:0: R0903: Too few public methods (0/2) (too-few-public-methods)
bottles/frontend/windows/exclusionpatterns.py:61:0: R0903: Too few public methods (0/2) (too-few-public-methods)
************* Module bottles.frontend.windows.gamescope
bottles/frontend/windows/gamescope.py:110:0: C0305: Trailing newlines (trailing-newlines)
bottles/frontend/windows/gamescope.py:21:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/gamescope.py:23:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/gamescope.py:18:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/windows/gamescope.py:56:29: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/windows/gamescope.py:98:8: C0206: Consider iterating with .items() (consider-using-dict-items)
bottles/frontend/windows/gamescope.py:98:23: C0201: Consider iterating the dictionary directly instead of calling .keys() (consider-iterating-dictionary)
bottles/frontend/windows/gamescope.py:22:0: R0903: Too few public methods (0/2) (too-few-public-methods)
************* Module bottles.frontend.windows.vmtouch
bottles/frontend/windows/vmtouch.py:66:0: C0305: Trailing newlines (trailing-newlines)
bottles/frontend/windows/vmtouch.py:23:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/vmtouch.py:25:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/vmtouch.py:20:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/windows/vmtouch.py:54:8: C0206: Consider iterating with .items() (consider-using-dict-items)
bottles/frontend/windows/vmtouch.py:54:23: C0201: Consider iterating the dictionary directly instead of calling .keys() (consider-iterating-dictionary)
bottles/frontend/windows/vmtouch.py:24:0: R0903: Too few public methods (0/2) (too-few-public-methods)
************* Module bottles.frontend.windows.drives
bottles/frontend/windows/drives.py:23:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/drives.py:25:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/drives.py:90:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/drives.py:92:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/drives.py:18:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/windows/drives.py:24:0: R0903: Too few public methods (0/2) (too-few-public-methods)
bottles/frontend/windows/drives.py:138:8: C0206: Consider iterating with .items() (consider-using-dict-items)
bottles/frontend/windows/drives.py:91:0: R0903: Too few public methods (1/2) (too-few-public-methods)
************* Module bottles.frontend.windows.sandbox
bottles/frontend/windows/sandbox.py:21:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/sandbox.py:23:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/frontend/windows/sandbox.py:18:0: E0611: No name 'Adw' in module 'gi.repository' (no-name-in-module)
bottles/frontend/windows/sandbox.py:45:25: W0613: Unused argument 'widget' (unused-argument)
bottles/frontend/windows/sandbox.py:22:0: R0903: Too few public methods (0/2) (too-few-public-methods)

[emansom]

Functional again. Thanks! 👍🏻

[koplo199]

You're welcome, thanks for the report!

[orowith2os]

Ouch. Welp, I'll have to take a closer look at it later.