change config back to file, point imports to git.types

Author: Yobmod

git/compat.py

@@ -0,0 +1,108 @@
+# -*- coding: utf-8 -*-
+# config.py
+# Copyright (C) 2008, 2009 Michael Trier (mtrier@gmail.com) and contributors
+#
+# This module is part of GitPython and is released under
+# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+"""utilities to help provide compatibility with python 3"""
+# flake8: noqa
+
+import locale
+import os
+import sys
+
+from gitdb.utils.encoding import (
+    force_bytes,     # @UnusedImport
+    force_text       # @UnusedImport
+)
+
+# typing --------------------------------------------------------------------
+
+from typing import (
+    Any,
+    AnyStr,
+    Dict,
+    IO,
+    Optional,
+    Tuple,
+    Type,
+    Union,
+    overload,
+)
+from git.types import TBD
+
+# ---------------------------------------------------------------------------
+
+
+is_win = (os.name == 'nt')  # type: bool
+is_posix = (os.name == 'posix')
+is_darwin = (os.name == 'darwin')
+defenc = sys.getfilesystemencoding()
+
+
+@overload
+def safe_decode(s: None) -> None: ...
+
+@overload
+def safe_decode(s: Union[IO[str], AnyStr]) -> str: ...
+
+def safe_decode(s: Union[IO[str], AnyStr, None]) -> Optional[str]:
+    """Safely decodes a binary string to unicode"""
+    if isinstance(s, str):
+        return s
+    elif isinstance(s, bytes):
+        return s.decode(defenc, 'surrogateescape')
+    elif s is None:
+        return None
+    else:
+        raise TypeError('Expected bytes or text, but got %r' % (s,))
+
+
+@overload
+def safe_encode(s: None) -> None: ...
+
+@overload
+def safe_encode(s: AnyStr) -> bytes: ...
+
+def safe_encode(s: Optional[AnyStr]) -> Optional[bytes]:
+    """Safely encodes a binary string to unicode"""
+    if isinstance(s, str):
+        return s.encode(defenc)
+    elif isinstance(s, bytes):
+        return s
+    elif s is None:
+        return None
+    else:
+        raise TypeError('Expected bytes or text, but got %r' % (s,))
+
+
+@overload
+def win_encode(s: None) -> None: ...
+
+@overload
+def win_encode(s: AnyStr) -> bytes: ...
+
+def win_encode(s: Optional[AnyStr]) -> Optional[bytes]:
+    """Encode unicodes for process arguments on Windows."""
+    if isinstance(s, str):
+        return s.encode(locale.getpreferredencoding(False))
+    elif isinstance(s, bytes):
+        return s
+    elif s is not None:
+        raise TypeError('Expected bytes or text, but got %r' % (s,))
+    return None
+
+
+def with_metaclass(meta: Type[Any], *bases: Any) -> TBD: # type: ignore ## mypy cannot understand dynamic class creation
+    """copied from https://github.com/Byron/bcore/blob/master/src/python/butility/future.py#L15"""
+
+    class metaclass(meta):  # type: ignore
+        __call__ = type.__call__
+        __init__ = type.__init__    # type: ignore
+
+        def __new__(cls, name: str, nbases: Optional[Tuple[int, ...]], d: Dict[str, Any]) -> TBD:
+            if nbases is None:
+                return type.__new__(cls, name, (), d)
+            return meta(name, bases, d)
+
+    return metaclass(meta.__name__ + 'Helper', None, {}) # type: ignore

git/compat/__init__.py renamed to git/compat/compat.py

@@ -22,13 +22,23 @@
     with_metaclass,
     is_win,
 )
-from git.compat.typing import Literal
+
 from git.util import LockFile
 
 import os.path as osp
 
 import configparser as cp
 
+# typing-------------------------------------------------------
+
+from typing import TYPE_CHECKING, Tuple
+
+from git.types import Literal
+
+if TYPE_CHECKING:
+    pass
+
+# -------------------------------------------------------------
 
 __all__ = ('GitConfigParser', 'SectionConstraint')
 
@@ -38,7 +48,7 @@
 
 # invariants
 # represents the configuration level of a configuration file
-CONFIG_LEVELS = ("system", "user", "global", "repository")
+CONFIG_LEVELS = ("system", "user", "global", "repository")  # type: Tuple[Literal['system'], Literal['user'], Literal['global'], Literal['repository']]
 
 # Section pattern to detect conditional includes.
 # https://git-scm.com/docs/git-config#_conditional_includes

git/compat/typing.py

@@ -16,8 +16,7 @@
 # typing ------------------------------------------------------------------
 
 from typing import Any, Iterator, List, Match, Optional, Tuple, Type, Union, TYPE_CHECKING
-from git.compat.typing import Final, Literal
-from git.types import TBD
+from git.types import TBD, Final, Literal
 
 if TYPE_CHECKING:
     from .objects.tree import Tree

git/config.py

@@ -35,8 +35,7 @@
 
 # typing ------------------------------------------------------
 
-from git.compat.typing import Literal
-from git.types import TBD, PathLike
+from git.types import TBD, PathLike, Literal
 from typing import (Any, BinaryIO, Callable, Dict,
                     Iterator, List, Mapping, Optional,
                     TextIO, Tuple, Type, Union,