Browse Source

Merge pull request #987 from dimbleby/tidying

tidying up the boolean config change
Jelmer Vernooij 2 years ago
parent
commit
bc10bc8f2b
2 changed files with 2 additions and 10 deletions
  1. 0 1
      dulwich/client.py
  2. 2 9
      dulwich/config.py

+ 0 - 1
dulwich/client.py

@@ -2285,7 +2285,6 @@ def iter_instead_of(config: Config, push: bool = False) -> Iterable[Tuple[str, s
             except KeyError:
                 pass
         for needle in needles:
-            assert isinstance(needle, bytes)
             yield needle.decode('utf-8'), replacement.decode('utf-8')
 
 

+ 2 - 9
dulwich/config.py

@@ -199,8 +199,6 @@ class Config(object):
             value = self.get(section, name)
         except KeyError:
             return default
-        if isinstance(value, bool):
-            return value
         if value.lower() == b"true":
             return True
         elif value.lower() == b"false":
@@ -401,7 +399,7 @@ class ConfigDict(Config, MutableMapping[Section, MutableMapping[Name, Value]]):
         return self._values.keys()
 
 
-def _format_string(value):
+def _format_string(value: bytes) -> bytes:
     if (
         value.startswith(b" ")
         or value.startswith(b"\t")
@@ -618,12 +616,7 @@ class ConfigFile(ConfigDict):
             else:
                 f.write(b"[" + section_name + b' "' + subsection_name + b'"]\n')
             for key, value in values.items():
-                if value is True:
-                    value = b"true"
-                elif value is False:
-                    value = b"false"
-                else:
-                    value = _format_string(value)
+                value = _format_string(value)
                 f.write(b"\t" + key + b" = " + value + b"\n")