Consolidate str and os.PathLike[str] (use GitPython's PathLike) · gitpython-developers/GitPython@62c0823 · GitHub

gitpython-developers / GitPython Public

• Notifications You must be signed in to change notification settings
• Fork 989
• Star 5.2k

• Code
• Issues 8
• Pull requests 2
• Discussions
• Actions
• Security and quality 34
• Insights

Additional navigation options

Commit 62c0823

Browse filesBrowse the repository at this point in the historyBrowse files

EliahKagan

committed

Consolidate str and os.PathLike[str] (use GitPython's PathLike)

Where they had been introduced and written separately in 0e1df29 before this. The main reason is that it would have to be quoted as a string for compatibility with Python 3.8 and lower, since os.PathLike only defined __class_getitem__ in 3.8 and later. (The definition in git.types already does that.) In addition, the benefit of keeping them separate was negligible, as mentioned in 0e1df29.

1 parent 0e1df29 commit 62c0823
Copy full SHA for 62c0823

2 files changed

+4-5Lines changed: 4 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• git
  • diff.py
  • index
    • base.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎git/diff.py‎

Copy file name to clipboardExpand all lines: git/diff.py

+2-3Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -3,7 +3,6 @@
3	3	# This module is part of GitPython and is released under the
4	4	# 3-Clause BSD License: https://opensource.org/license/bsd-3-clause/
5	5
6		- import os
7	6	import re
8	7
9	8	from git.cmd import handle_process_output
@@ -100,8 +99,8 @@ class Index:
100	99
101	100	def _process_diff_args(
102	101	self,
103		- args: List[Union[str, os.PathLike[str], "Diffable", Type["Index"]]],
104		- ) -> List[Union[str, os.PathLike[str], "Diffable", Type["Index"]]]:
	102	+ args: List[Union[PathLike, "Diffable", Type["Index"]]],
	103	+ ) -> List[Union[PathLike, "Diffable", Type["Index"]]]:
105	104	"""
106	105	:return:
107	106	Possibly altered version of the given args list.

Collapse file

‎git/index/base.py‎

Copy file name to clipboardExpand all lines: git/index/base.py

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -645,8 +645,8 @@ def write_tree(self) -> Tree:
645	645
646	646	def _process_diff_args(
647	647	self,
648		- args: List[Union[str, os.PathLike[str], "git_diff.Diffable", Type["git_diff.Diffable.Index"]]],
649		- ) -> List[Union[str, os.PathLike[str], "git_diff.Diffable", Type["git_diff.Diffable.Index"]]]:
	648	+ args: List[Union[PathLike, "git_diff.Diffable", Type["git_diff.Diffable.Index"]]],
	649	+ ) -> List[Union[PathLike, "git_diff.Diffable", Type["git_diff.Diffable.Index"]]]:
650	650	try:
651	651	args.pop(args.index(self))
652	652	except IndexError:

0 commit comments

Comments

0 (0)