Fixed comparison with None, properly unset environment variables by deleting

them, updated the test to check this behaviour, refactored test code by
removing redundant variables and improving readability.

1 files changed, 4 insertions, 5 deletions

diff --git a/qutebrowser/config/qtargs.py b/qutebrowser/config/qtargs.py
index dde8e1131..d6375f331 100644
--- a/qutebrowser/config/qtargs.py
+++ b/qutebrowser/config/qtargs.py
@@ -260,9 +260,8 @@ def init_envvars() -> None:
                    else 'QT_AUTO_SCREEN_SCALE_FACTOR')
         os.environ[env_var] = '1'
 
-    for var in config.val.qt.environ:
-        val = config.val.qt.environ[var]
-        if val == 'None':
-            os.environ[var] = ''
-        else:
+    for var, val in config.val.qt.environ.items():
+        if val is None and var in os.environ:
+            del os.environ[var]
+        elif val is not None:
             os.environ[var] = val