FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Replace all Typeguard with cast, revert update to typing-extensions==… · gitpython-developers/GitPython@e6345d6 · GitHub

  1. gitpython-developers
  2. GitPython

Repository navigation

Commit e6345d6

Browse files
Yobmod
committed
Replace all Typeguard with cast, revert update to typing-extensions==3.10.0
1 parent 0c1446d commit e6345d6

10 files changed

Lines changed: 49 additions & 44 deletions

File tree

‎git/config.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from typing import (Any, Callable, IO, List, Dict, Sequence,
3535
TYPE_CHECKING, Tuple, Union, cast, overload)
3636

37-
from git.types import Lit_config_levels, ConfigLevels_Tup, PathLike, TBD, assert_never, is_config_level
37+
from git.types import Lit_config_levels, ConfigLevels_Tup, PathLike, TBD, assert_never
3838

3939
if TYPE_CHECKING:
4040
from git.repo.base import Repo
@@ -309,9 +309,9 @@ def __init__(self, file_or_files: Union[None, PathLike, 'BytesIO', Sequence[Unio
309309
else:
310310
if config_level is None:
311311
if read_only:
312-
self._file_or_files = [get_config_path(f)
312+
self._file_or_files = [get_config_path(cast(Lit_config_levels, f))
313313
for f in CONFIG_LEVELS
314-
if is_config_level(f) and f != 'repository']
314+
if f != 'repository']
315315
else:
316316
raise ValueError("No configuration level or configuration files specified")
317317
else:

‎git/diff.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
# typing ------------------------------------------------------------------
1717

18-
from typing import Any, Iterator, List, Match, Optional, Tuple, Type, TypeVar, Union, TYPE_CHECKING
19-
from git.types import PathLike, TBD, Literal, TypeGuard
18+
from typing import Any, Iterator, List, Match, Optional, Tuple, Type, TypeVar, Union, TYPE_CHECKING, cast
19+
from git.types import PathLike, TBD, Literal
2020

2121
if TYPE_CHECKING:
2222
from .objects.tree import Tree
@@ -28,9 +28,9 @@
2828
Lit_change_type = Literal['A', 'D', 'C', 'M', 'R', 'T', 'U']
2929

3030

31-
def is_change_type(inp: str) -> TypeGuard[Lit_change_type]:
32-
# return True
33-
return inp in ['A', 'D', 'C', 'M', 'R', 'T', 'U']
31+
# def is_change_type(inp: str) -> TypeGuard[Lit_change_type]:
32+
# # return True
33+
# return inp in ['A', 'D', 'C', 'M', 'R', 'T', 'U']
3434

3535
# ------------------------------------------------------------------------
3636

@@ -517,8 +517,8 @@ def _handle_diff_line(lines_bytes: bytes, repo: 'Repo', index: DiffIndex) -> Non
517517
# Change type can be R100
518518
# R: status letter
519519
# 100: score (in case of copy and rename)
520-
assert is_change_type(_change_type[0]), f"Unexpected value for change_type received: {_change_type[0]}"
521-
change_type: Lit_change_type = _change_type[0]
520+
# assert is_change_type(_change_type[0]), f"Unexpected value for change_type received: {_change_type[0]}"
521+
change_type: Lit_change_type = cast(Lit_change_type, _change_type[0])
522522
score_str = ''.join(_change_type[1:])
523523
score = int(score_str) if score_str.isdigit() else None
524524
path = path.strip()

‎git/index/fun.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
from typing import (Dict, IO, List, Sequence, TYPE_CHECKING, Tuple, Type, Union, cast)
5555

56-
from git.types import PathLike, TypeGuard
56+
from git.types import PathLike
5757

5858
if TYPE_CHECKING:
5959
from .base import IndexFile
@@ -188,15 +188,16 @@ def entry_key(*entry: Union[BaseIndexEntry, PathLike, int]) -> Tuple[PathLike, i
188188
""":return: Key suitable to be used for the index.entries dictionary
189189
:param entry: One instance of type BaseIndexEntry or the path and the stage"""
190190

191-
def is_entry_key_tup(entry_key: Tuple) -> TypeGuard[Tuple[PathLike, int]]:
192-
return isinstance(entry_key, tuple) and len(entry_key) == 2
191+
# def is_entry_key_tup(entry_key: Tuple) -> TypeGuard[Tuple[PathLike, int]]:
192+
# return isinstance(entry_key, tuple) and len(entry_key) == 2
193193

194194
if len(entry) == 1:
195195
entry_first = entry[0]
196196
assert isinstance(entry_first, BaseIndexEntry)
197197
return (entry_first.path, entry_first.stage)
198198
else:
199-
assert is_entry_key_tup(entry)
199+
# assert is_entry_key_tup(entry)
200+
entry = cast(Tuple[PathLike, int], entry)
200201
return entry
201202
# END handle entry
202203

@@ -244,7 +245,7 @@ def read_cache(stream: IO[bytes]) -> Tuple[int, Dict[Tuple[PathLike, int], 'Inde
244245
content_sha = extension_data[-20:]
245246

246247
# truncate the sha in the end as we will dynamically create it anyway
247-
extension_data = extension_data[:-20]
248+
extension_data = extension_data[: -20]
248249

249250
return (version, entries, extension_data, content_sha)
250251

‎git/objects/commit.py‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939

4040
# typing ------------------------------------------------------------------
4141

42-
from typing import Any, IO, Iterator, List, Sequence, Tuple, Union, TYPE_CHECKING
42+
from typing import Any, IO, Iterator, List, Sequence, Tuple, Union, TYPE_CHECKING, cast
4343

44-
from git.types import PathLike, TypeGuard, Literal
44+
from git.types import PathLike, Literal
4545

4646
if TYPE_CHECKING:
4747
from git.repo import Repo
@@ -323,16 +323,18 @@ def _iter_from_process_or_stream(cls, repo: 'Repo', proc_or_stream: Union[Popen,
323323
:param proc: git-rev-list process instance - one sha per line
324324
:return: iterator returning Commit objects"""
325325

326-
def is_proc(inp) -> TypeGuard[Popen]:
327-
return hasattr(proc_or_stream, 'wait') and not hasattr(proc_or_stream, 'readline')
326+
# def is_proc(inp) -> TypeGuard[Popen]:
327+
# return hasattr(proc_or_stream, 'wait') and not hasattr(proc_or_stream, 'readline')
328328

329-
def is_stream(inp) -> TypeGuard[IO]:
330-
return hasattr(proc_or_stream, 'readline')
329+
# def is_stream(inp) -> TypeGuard[IO]:
330+
# return hasattr(proc_or_stream, 'readline')
331331

332-
if is_proc(proc_or_stream):
332+
if hasattr(proc_or_stream, 'wait'):
333+
proc_or_stream = cast(Popen, proc_or_stream)
333334
if proc_or_stream.stdout is not None:
334335
stream = proc_or_stream.stdout
335-
elif is_stream(proc_or_stream):
336+
elif hasattr(proc_or_stream, 'readline'):
337+
proc_or_stream = cast(IO, proc_or_stream)
336338
stream = proc_or_stream
337339

338340
readline = stream.readline
@@ -351,7 +353,8 @@ def is_stream(inp) -> TypeGuard[IO]:
351353
# END for each line in stream
352354
# TODO: Review this - it seems process handling got a bit out of control
353355
# due to many developers trying to fix the open file handles issue
354-
if is_proc(proc_or_stream):
356+
if hasattr(proc_or_stream, 'wait'):
357+
proc_or_stream = cast(Popen, proc_or_stream)
355358
finalize_process(proc_or_stream)
356359

357360
@ classmethod

‎git/objects/tree.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from typing import (Any, Callable, Dict, Iterable, Iterator, List,
2525
Tuple, Type, Union, cast, TYPE_CHECKING)
2626

27-
from git.types import PathLike, TypeGuard, Literal
27+
from git.types import PathLike, Literal
2828

2929
if TYPE_CHECKING:
3030
from git.repo import Repo
@@ -36,8 +36,8 @@
3636
Tuple['Submodule', 'Submodule']]]
3737

3838

39-
def is_tree_cache(inp: Tuple[bytes, int, str]) -> TypeGuard[TreeCacheTup]:
40-
return isinstance(inp[0], bytes) and isinstance(inp[1], int) and isinstance([inp], str)
39+
# def is_tree_cache(inp: Tuple[bytes, int, str]) -> TypeGuard[TreeCacheTup]:
40+
# return isinstance(inp[0], bytes) and isinstance(inp[1], int) and isinstance([inp], str)
4141

4242
#--------------------------------------------------------
4343

‎git/refs/reference.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# typing ------------------------------------------------------------------
99

1010
from typing import Any, Callable, Iterator, List, Match, Optional, Tuple, Type, TypeVar, Union, TYPE_CHECKING # NOQA
11-
from git.types import Commit_ish, PathLike, TBD, Literal, TypeGuard, _T # NOQA
11+
from git.types import Commit_ish, PathLike, TBD, Literal, _T # NOQA
1212

1313
if TYPE_CHECKING:
1414
from git.repo import Repo

‎git/refs/symbolic.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# typing ------------------------------------------------------------------
2525

2626
from typing import Any, Iterator, List, Match, Optional, Tuple, Type, TypeVar, Union, TYPE_CHECKING # NOQA
27-
from git.types import Commit_ish, PathLike, TBD, Literal, TypeGuard # NOQA
27+
from git.types import Commit_ish, PathLike, TBD, Literal # NOQA
2828

2929
if TYPE_CHECKING:
3030
from git.repo import Repo

‎git/remote.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
# typing-------------------------------------------------------
3838

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

42-
from git.types import PathLike, Literal, TBD, TypeGuard, Commit_ish # NOQA[TC002]
42+
from git.types import PathLike, Literal, TBD, Commit_ish # NOQA[TC002]
4343

4444
if TYPE_CHECKING:
4545
from git.repo.base import Repo
@@ -50,8 +50,8 @@
5050
flagKeyLiteral = Literal[' ', '!', '+', '-', '*', '=', 't', '?']
5151

5252

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

5656

5757
# -------------------------------------------------------------
@@ -342,8 +342,8 @@ def _from_line(cls, repo: 'Repo', line: str, fetch_line: str) -> 'FetchInfo':
342342
# parse lines
343343
remote_local_ref_str: str
344344
control_character, operation, local_remote_ref, remote_local_ref_str, note = match.groups()
345-
assert is_flagKeyLiteral(control_character), f"{control_character}"
346-
345+
# assert is_flagKeyLiteral(control_character), f"{control_character}"
346+
control_character = cast(flagKeyLiteral, control_character)
347347
try:
348348
_new_hex_sha, _fetch_operation, fetch_note = fetch_line.split("\t")
349349
ref_type_name, fetch_note = fetch_note.split(' ', 1)

‎git/repo/base.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# typing ------------------------------------------------------
3838

39-
from git.types import TBD, PathLike, Lit_config_levels, Commit_ish, Tree_ish, is_config_level
39+
from git.types import TBD, PathLike, Lit_config_levels, Commit_ish, Tree_ish
4040
from typing import (Any, BinaryIO, Callable, Dict,
4141
Iterator, List, Mapping, Optional, Sequence,
4242
TextIO, Tuple, Type, Union,
@@ -498,7 +498,8 @@ def config_reader(self, config_level: Optional[Lit_config_levels] = None) -> Git
498498
unknown, instead the global path will be used."""
499499
files = None
500500
if config_level is None:
501-
files = [self._get_config_path(f) for f in self.config_level if is_config_level(f)]
501+
files = [self._get_config_path(cast(Lit_config_levels, f))
502+
for f in self.config_level if cast(Lit_config_levels, f)]
502503
else:
503504
files = [self._get_config_path(config_level)]
504505
return GitConfigParser(files, read_only=True, repo=self)

‎git/types.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
else:
1313
from typing_extensions import Final, Literal, SupportsIndex, TypedDict, Protocol, runtime_checkable # noqa: F401
1414

15-
if sys.version_info[:2] >= (3, 10):
16-
from typing import TypeGuard # noqa: F401
17-
else:
18-
from typing_extensions import TypeGuard # noqa: F401
15+
# if sys.version_info[:2] >= (3, 10):
16+
# from typing import TypeGuard # noqa: F401
17+
# else:
18+
# from typing_extensions import TypeGuard # noqa: F401
1919

2020

2121
if sys.version_info[:2] < (3, 9):
@@ -41,9 +41,9 @@
4141
Lit_config_levels = Literal['system', 'global', 'user', 'repository']
4242

4343

44-
def is_config_level(inp: str) -> TypeGuard[Lit_config_levels]:
45-
# return inp in get_args(Lit_config_level) # only py >= 3.8
46-
return inp in ("system", "user", "global", "repository")
44+
# def is_config_level(inp: str) -> TypeGuard[Lit_config_levels]:
45+
# # return inp in get_args(Lit_config_level) # only py >= 3.8
46+
# return inp in ("system", "user", "global", "repository")
4747

4848

4949
ConfigLevels_Tup = Tuple[Literal['system'], Literal['user'], Literal['global'], Literal['repository']]

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL