gitpython-developers
diff --git a/‎git/util.py
Copy file name to clipboardExpand all lines: git/util.py
+2-3Lines changed: 2 additions & 3 deletions b/‎git/util.py
Copy file name to clipboardExpand all lines: git/util.py
+2-3Lines changed: 2 additions & 3 deletions
diff --git a/‎test/test_util.py
Copy file name to clipboardExpand all lines: test/test_util.py
+3-3Lines changed: 3 additions & 3 deletions b/‎test/test_util.py
Copy file name to clipboardExpand all lines: test/test_util.py
+3-3Lines changed: 3 additions & 3 deletions
@@ -110,7 +110,7 @@
 log = logging.getLogger(__name__)
 
 
-def _read_env_flag(name: str, default: bool) -> Union[bool, str]:
+def _read_env_flag(name: str, default: bool) -> bool:
     try:
         value = os.environ[name]
     except KeyError:
@@ -121,9 +121,8 @@ def _read_env_flag(name: str, default: bool) -> Union[bool, str]:
         name,
     )
 
-    # FIXME: This should always return bool, as that is how it is used.
     # FIXME: This should treat some values besides "" as expressing falsehood.
-    return value
+    return bool(value)
 
 
 #: We need an easy way to see if Appveyor TCs start failing,
 
@@ -520,7 +520,7 @@ def run_parse(value):
             )
             return ast.literal_eval(output)
 
-        assert_true_iff_win = self.assertTrue if os.name == "nt" else self.assertFalse
+        true_iff_win = os.name == "nt"  # Same as is_win, but don't depend on that here.
 
         truthy_cases = [
             ("unset", None),
@@ -542,8 +542,8 @@ def run_parse(value):
 
         for msg, env_var_value in truthy_cases:
             with self.subTest(msg, env_var_value=env_var_value):
-                assert_true_iff_win(run_parse(env_var_value))
+                self.assertIs(run_parse(env_var_value), true_iff_win)
 
         for msg, env_var_value in falsy_cases:
             with self.subTest(msg, env_var_value=env_var_value):
-                self.assertFalse(run_parse(env_var_value))
+                self.assertIs(run_parse(env_var_value), False)