Skip to content

Commit c878771

Browse files
YobmodYobmod
committed
replace more TBDs wiht runtime types
1 parent 39d37d5 commit c878771

File tree

4 files changed

+22
-20
lines changed

4 files changed

+22
-20
lines changed

‎git/cmd.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -421,27 +421,27 @@ def __getattr__(self, attr: str) -> Any:
421421
return getattr(self.proc, attr)
422422

423423
# TODO: Bad choice to mimic `proc.wait()` but with different args.
424-
def wait(self, stderr: Union[None, bytes] = b'') -> int:
424+
def wait(self, stderr: Union[None, str, bytes] = b'') -> int:
425425
"""Wait for the process and return its status code.
426426
427427
:param stderr: Previously read value of stderr, in case stderr is already closed.
428428
:warn: may deadlock if output or error pipes are used and not handled separately.
429429
:raise GitCommandError: if the return status is not 0"""
430430
if stderr is None:
431-
stderr = b''
432-
stderr = force_bytes(data=stderr, encoding='utf-8')
431+
stderr_b = b''
432+
stderr_b = force_bytes(data=stderr, encoding='utf-8')
433433

434434
if self.proc is not None:
435435
status = self.proc.wait()
436436

437437
def read_all_from_possibly_closed_stream(stream: Union[IO[bytes], None]) -> bytes:
438438
if stream:
439439
try:
440-
return stderr + force_bytes(stream.read())
440+
return stderr_b + force_bytes(stream.read())
441441
except ValueError:
442-
return stderr or b''
442+
return stderr_b or b''
443443
else:
444-
return stderr or b''
444+
return stderr_b or b''
445445

446446
if status != 0:
447447
errstr = read_all_from_possibly_closed_stream(self.proc.stderr)

‎git/config.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from typing import (Any, Callable, Generic, IO, List, Dict, Sequence,
3434
TYPE_CHECKING, Tuple, TypeVar, Union, cast, overload)
3535

36-
from git.types import Lit_config_levels, ConfigLevels_Tup, PathLike, TBD, assert_never, _T
36+
from git.types import Lit_config_levels, ConfigLevels_Tup, PathLike, assert_never, _T
3737

3838
if TYPE_CHECKING:
3939
from git.repo.base import Repo
@@ -72,7 +72,7 @@
7272

7373
class MetaParserBuilder(abc.ABCMeta):
7474
"""Utlity class wrapping base-class methods into decorators that assure read-only properties"""
75-
def __new__(cls, name: str, bases: TBD, clsdict: Dict[str, Any]) -> TBD:
75+
def __new__(cls, name: str, bases: Tuple, clsdict: Dict[str, Any]) -> 'MetaParserBuilder':
7676
"""
7777
Equip all base-class methods with a needs_values decorator, and all non-const methods
7878
with a set_dirty_and_flush_changes decorator in addition to that."""
@@ -617,20 +617,21 @@ def _write(self, fp: IO) -> None:
617617
def write_section(name: str, section_dict: _OMD) -> None:
618618
fp.write(("[%s]\n" % name).encode(defenc))
619619

620-
values: Sequence[Union[str, bytes, int, float, bool]]
620+
values: Sequence[str] # runtime only gets str in tests, but should be whatever _OMD stores
621+
v: str
621622
for (key, values) in section_dict.items_all():
622623
if key == "__name__":
623624
continue
624625

625-
v: Union[str, bytes, int, float, bool]
626626
for v in values:
627627
fp.write(("\t%s = %s\n" % (key, self._value_to_string(v).replace('\n', '\n\t'))).encode(defenc))
628628
# END if key is not __name__
629629
# END section writing
630630

631631
if self._defaults:
632632
write_section(cp.DEFAULTSECT, self._defaults)
633-
value: TBD
633+
value: _OMD
634+
634635
for name, value in self._sections.items():
635636
write_section(name, value)
636637

‎git/remote.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737

3838
# typing-------------------------------------------------------
3939

40-
from typing import (Any, Callable, Dict, Iterator, List, NoReturn, Optional, Sequence, # NOQA[TC002]
40+
from typing import (Any, Callable, Dict, Iterator, List, NoReturn, Optional, Sequence,
4141
TYPE_CHECKING, Type, Union, cast, overload)
4242

43-
from git.types import PathLike, Literal, TBD, Commit_ish # NOQA[TC002]
43+
from git.types import PathLike, Literal, Commit_ish
4444

4545
if TYPE_CHECKING:
4646
from git.repo.base import Repo
@@ -50,7 +50,6 @@
5050

5151
flagKeyLiteral = Literal[' ', '!', '+', '-', '*', '=', 't', '?']
5252

53-
5453
# def is_flagKeyLiteral(inp: str) -> TypeGuard[flagKeyLiteral]:
5554
# return inp in [' ', '!', '+', '-', '=', '*', 't', '?']
5655

@@ -707,9 +706,10 @@ def update(self, **kwargs: Any) -> 'Remote':
707706
self.repo.git.remote(scmd, self.name, **kwargs)
708707
return self
709708

710-
def _get_fetch_info_from_stderr(self, proc: TBD,
709+
def _get_fetch_info_from_stderr(self, proc: 'Git.AutoInterrupt',
711710
progress: Union[Callable[..., Any], RemoteProgress, None]
712711
) -> IterableList['FetchInfo']:
712+
713713
progress = to_progress_instance(progress)
714714

715715
# skip first line as it is some remote info we are not interested in
@@ -768,7 +768,7 @@ def _get_fetch_info_from_stderr(self, proc: TBD,
768768
log.warning("Git informed while fetching: %s", err_line.strip())
769769
return output
770770

771-
def _get_push_info(self, proc: TBD,
771+
def _get_push_info(self, proc: 'Git.AutoInterrupt',
772772
progress: Union[Callable[..., Any], RemoteProgress, None]) -> IterableList[PushInfo]:
773773
progress = to_progress_instance(progress)
774774

‎git/repo/base.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def __init__(self, path: Optional[PathLike] = None, odbt: Type[LooseObjectDB] =
235235
def __enter__(self) -> 'Repo':
236236
return self
237237

238-
def __exit__(self, exc_type: TBD, exc_value: TBD, traceback: TBD) -> None:
238+
def __exit__(self, *args: Any) -> None:
239239
self.close()
240240

241241
def __del__(self) -> None:
@@ -445,7 +445,7 @@ def create_tag(self, path: PathLike, ref: str = 'HEAD',
445445
:return: TagReference object """
446446
return TagReference.create(self, path, ref, message, force, **kwargs)
447447

448-
def delete_tag(self, *tags: TBD) -> None:
448+
def delete_tag(self, *tags: TagReference) -> None:
449449
"""Delete the given tag references"""
450450
return TagReference.delete(self, *tags)
451451

@@ -795,7 +795,7 @@ def active_branch(self) -> Head:
795795
# reveal_type(self.head.reference) # => Reference
796796
return self.head.reference
797797

798-
def blame_incremental(self, rev: TBD, file: TBD, **kwargs: Any) -> Optional[Iterator['BlameEntry']]:
798+
def blame_incremental(self, rev: Union[str, HEAD], file: str, **kwargs: Any) -> Iterator['BlameEntry']:
799799
"""Iterator for blame information for the given file at the given revision.
800800
801801
Unlike .blame(), this does not return the actual file's contents, only
@@ -809,6 +809,7 @@ def blame_incremental(self, rev: TBD, file: TBD, **kwargs: Any) -> Optional[Iter
809809
If you combine all line number ranges outputted by this command, you
810810
should get a continuous range spanning all line numbers in the file.
811811
"""
812+
812813
data = self.git.blame(rev, '--', file, p=True, incremental=True, stdout_as_string=False, **kwargs)
813814
commits: Dict[str, Commit] = {}
814815

@@ -870,7 +871,7 @@ def blame_incremental(self, rev: TBD, file: TBD, **kwargs: Any) -> Optional[Iter
870871
safe_decode(orig_filename),
871872
range(orig_lineno, orig_lineno + num_lines))
872873

873-
def blame(self, rev: TBD, file: TBD, incremental: bool = False, **kwargs: Any
874+
def blame(self, rev: Union[str, HEAD], file: str, incremental: bool = False, **kwargs: Any
874875
) -> Union[List[List[Union[Optional['Commit'], List[str]]]], Optional[Iterator[BlameEntry]]]:
875876
"""The blame information for the given file at the given revision.
876877

0 commit comments

Comments
 (0)