BREAKING CHANGES for v4.0

git/objects/submodule/base.py

@@ -4,6 +4,7 @@
 __all__ = ["Submodule", "UpdateProgress"]
 
 import gc
+from configparser import NoSectionError
 from io import BytesIO
 import logging
 import os
@@ -16,7 +17,7 @@
 import git
 from git.cmd import Git
 from git.compat import defenc
-from git.config import GitConfigParser, SectionConstraint, cp
+from git.config import GitConfigParser, SectionConstraint
 from git.exc import (
     BadName,
     InvalidGitRepositoryError,
@@ -172,7 +173,7 @@ def _set_cache_(self, attr: str) -> None:
             # Default submodule values.
             try:
                 self.path = reader.get("path")
-            except cp.NoSectionError as e:
+            except NoSectionError as e:
                 if self.repo.working_tree_dir is not None:
                     raise ValueError(
                         "This submodule instance does not exist anymore in '%s' file"
@@ -1503,7 +1504,7 @@ def exists(self) -> bool:
                 if hasattr(self, attr):
                     loc[attr] = getattr(self, attr)
                 # END if we have the attribute cache
-            except (cp.NoSectionError, ValueError):
+            except (NoSectionError, ValueError):
                 # On PY3, this can happen apparently... don't know why this doesn't
                 # happen on PY2.
                 pass

git/objects/submodule/util.py

@@ -110,7 +110,7 @@ def flush_to_index(self) -> None:
     # } END interface
 
     # { Overridden Methods
-    def write(self) -> None:  # type: ignore[override]
+    def write(self) -> None:
         rval: None = super().write()
         self.flush_to_index()
         return rval

git/remote.py

@@ -8,12 +8,13 @@
 __all__ = ["RemoteProgress", "PushInfo", "FetchInfo", "Remote"]
 
 import contextlib
+from configparser import NoOptionError, NoSectionError
 import logging
 import re
 
 from git.cmd import Git, handle_process_output
 from git.compat import defenc, force_text
-from git.config import GitConfigParser, SectionConstraint, cp
+from git.config import GitConfigParser, SectionConstraint
 from git.exc import GitCommandError
 from git.refs import Head, Reference, RemoteReference, SymbolicReference, TagReference
 from git.util import (
@@ -577,7 +578,7 @@ def __getattr__(self, attr: str) -> Any:
         # though a slot of the same name exists.
         try:
             return self._config_reader.get(attr)
-        except cp.NoOptionError:
+        except NoOptionError:
             return super().__getattr__(attr)
         # END handle exception
 
@@ -619,10 +620,10 @@ def exists(self) -> bool:
         try:
             self.config_reader.get("url")
             return True
-        except cp.NoOptionError:
+        except NoOptionError:
             # We have the section at least...
             return True
-        except cp.NoSectionError:
+        except NoSectionError:
             return False
 
     @classmethod

test/fixtures/git_config

@@ -22,8 +22,7 @@
 	url = git://gitorious.org/~martin.marcher/git-python/serverhorror.git
 	fetch = +refs/heads/*:refs/remotes/MartinMarcher/*
     # can handle comments - the section name is supposed to be stripped
-# causes stock git-config puke
-[  gui ]
+[gui]
 	geometry = 1316x820+219+243 207 192
 [branch "mainline_performance"]
 	remote = mainline
@@ -43,4 +42,3 @@
 # inclusions should be processed immediately
 [sec]
     var1 = value1_main
-

test/fixtures/git_config_multiple

@@ -4,4 +4,4 @@
 [section1]
     option1 = value1a
     option1 = value1b
-    other_option1 = other_value1
+    other-option1 = other_value1

test/fixtures/git_config_with_quotes_escapes

@@ -3,7 +3,5 @@
   hasbackslash = "foo\\bar"
   hasquote = "ab\"cd"
   hastrailingbackslash = "word\\"
-  hasunrecognized = "p\qrs"
-  hasunescapedquotes = "ab"cd"e"
   ordinary = "hello world"
   unquoted = good evening