Commit3d4e476

committed

Improve how second-level imports and __all__ are written

These are in the modules that are directly under the top-level gitmodule (and are not themselves subpackages, with their ownsubmodules in the Python sense), except for:- git.util, where this change was very recently made.- git.compat, where no improvements of this kind were needed.- git.types, which currently has no __all__ and will only benefit from it if what should go in it is carefully considered (and where the imports themselves are grouped, sorted, and formatted already).

1 parentb8bab43 commit3d4e476Copy full SHA for 3d4e476

File tree

6 files changed

+33

-34

lines changed

6 files changed

+33

-34

lines changed

`‎git/cmd.py`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,18 +5,20 @@`
`5`	`5`
`6`	`6`	`from __future__importannotations`
`7`	`7`
`8`		`-importre`
	`8`	`+__all__= ("Git",)`
	`9`	`+`
`9`	`10`	`importcontextlib`
`10`	`11`	`importio`
`11`	`12`	`importitertools`
`12`	`13`	`importlogging`
`13`	`14`	`importos`
	`15`	`+importre`
`14`	`16`	`importsignal`
`15`		`-fromsubprocessimportPopen,PIPE,DEVNULL`
`16`	`17`	`importsubprocess`
	`18`	`+fromsubprocessimportDEVNULL,PIPE,Popen`
`17`	`19`	`importsys`
`18`		`-importthreading`
`19`	`20`	`fromtextwrapimportdedent`
	`21`	`+importthreading`
`20`	`22`
`21`	`23`	`fromgit.compatimportdefenc,force_bytes,safe_decode`
`22`	`24`	`fromgit.excimport (`
`@@ -57,12 +59,11 @@`
`57`	`59`	`overload,`
`58`	`60`	`)`
`59`	`61`
`60`		`-fromgit.typesimportPathLike,Literal,TBD`
	`62`	`+fromgit.typesimportLiteral,PathLike,TBD`
`61`	`63`
`62`	`64`	`ifTYPE_CHECKING:`
`63`		`-fromgit.repo.baseimportRepo`
`64`	`65`	`fromgit.diffimportDiffIndex`
`65`		`-`
	`66`	`+fromgit.repo.baseimportRepo`
`66`	`67`
`67`	`68`	`# ---------------------------------------------------------------------------------`
`68`	`69`
`@@ -84,8 +85,6 @@`
`84`	`85`
`85`	`86`	`_logger=logging.getLogger(__name__)`
`86`	`87`
`87`		`-__all__= ("Git",)`
`88`		`-`
`89`	`88`
`90`	`89`	`# ==============================================================================`
`91`	`90`	`## @name Utilities`

`‎git/config.py`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`"""Parser for reading and writing configuration files."""`
`7`	`7`
	`8`	`+__all__= ("GitConfigParser","SectionConstraint")`
	`9`	`+`
`8`	`10`	`importabc`
`9`	`11`	`importconfigparserascp`
`10`	`12`	`importfnmatch`
`@@ -40,9 +42,10 @@`
`40`	`42`	`fromgit.typesimportLit_config_levels,ConfigLevels_Tup,PathLike,assert_never,_T`
`41`	`43`
`42`	`44`	`ifTYPE_CHECKING:`
`43`		`-fromgit.repo.baseimportRepo`
`44`	`45`	`fromioimportBytesIO`
`45`	`46`
	`47`	`+fromgit.repo.baseimportRepo`
	`48`	`+`
`46`	`49`	`T_ConfigParser=TypeVar("T_ConfigParser",bound="GitConfigParser")`
`47`	`50`	`T_OMD_value=TypeVar("T_OMD_value",str,bytes,int,float,bool)`
`48`	`51`
`@@ -58,8 +61,6 @@`
`58`	`61`
`59`	`62`	`# -------------------------------------------------------------`
`60`	`63`
`61`		`-__all__= ("GitConfigParser","SectionConstraint")`
`62`		`-`
`63`	`64`	`_logger=logging.getLogger(__name__)`
`64`	`65`
`65`	`66`	`CONFIG_LEVELS:ConfigLevels_Tup= ("system","user","global","repository")`

`‎git/db.py`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,27 +3,26 @@`
`3`	`3`
`4`	`4`	`"""Module with our own gitdb implementation - it uses the git command."""`
`5`	`5`
`6`		`-fromgit.utilimportbin_to_hex,hex_to_bin`
`7`		`-fromgitdb.baseimportOInfo,OStream`
`8`		`-fromgitdb.dbimportGitDB`
`9`		`-fromgitdb.dbimportLooseObjectDB`
	`6`	`+__all__= ("GitCmdObjectDB","GitDB")`
`10`	`7`
	`8`	`+fromgitdb.baseimportOInfo,OStream`
	`9`	`+fromgitdb.dbimportGitDB,LooseObjectDB`
`11`	`10`	`fromgitdb.excimportBadObject`
	`11`	`+`
	`12`	`+fromgit.utilimportbin_to_hex,hex_to_bin`
`12`	`13`	`fromgit.excimportGitCommandError`
`13`	`14`
`14`	`15`	`# typing-------------------------------------------------`
`15`	`16`
`16`	`17`	`fromtypingimportTYPE_CHECKING`
	`18`	`+`
`17`	`19`	`fromgit.typesimportPathLike`
`18`	`20`
`19`	`21`	`ifTYPE_CHECKING:`
`20`	`22`	`fromgit.cmdimportGit`
`21`	`23`
`22`		`-`
`23`	`24`	`# --------------------------------------------------------`
`24`	`25`
`25`		`-__all__= ("GitCmdObjectDB","GitDB")`
`26`		`-`
`27`	`26`
`28`	`27`	`classGitCmdObjectDB(LooseObjectDB):`
`29`	`28`	`"""A database representing the default git object store, which includes loose`

`‎git/diff.py`

Lines changed: 11 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,17 @@`
`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`	`+__all__= ("DiffConstants","NULL_TREE","INDEX","Diffable","DiffIndex","Diff")`
	`7`	`+`
`6`	`8`	`importenum`
`7`	`9`	`importre`
`8`	`10`
`9`	`11`	`fromgit.cmdimporthandle_process_output`
`10`	`12`	`fromgit.compatimportdefenc`
	`13`	`+fromgit.objects.blobimportBlob`
	`14`	`+fromgit.objects.utilimportmode_str_to_int`
`11`	`15`	`fromgit.utilimportfinalize_process,hex_to_bin`
`12`	`16`
`13`		`-from .objects.blobimportBlob`
`14`		`-from .objects.utilimportmode_str_to_int`
`15`		`-`
`16`		`-`
`17`	`17`	`# typing ------------------------------------------------------------------`
`18`	`18`
`19`	`19`	`fromtypingimport (`
`@@ -23,29 +23,27 @@`
`23`	`23`	`Match,`
`24`	`24`	`Optional,`
`25`	`25`	`Tuple,`
	`26`	`+TYPE_CHECKING,`
`26`	`27`	`TypeVar,`
`27`	`28`	`Union,`
`28`		`-TYPE_CHECKING,`
`29`	`29`	`cast,`
`30`	`30`	`)`
`31`	`31`	`fromgit.typesimportLiteral,PathLike`
`32`	`32`
`33`	`33`	`ifTYPE_CHECKING:`
`34`		`-from .objects.treeimportTree`
`35`		`-from .objectsimportCommit`
`36`		`-fromgit.repo.baseimportRepo`
`37`		`-fromgit.objects.baseimportIndexObject`
`38`	`34`	`fromsubprocessimportPopen`
`39`		`-fromgitimportGit`
	`35`	`+`
	`36`	`+fromgit.cmdimportGit`
	`37`	`+fromgit.objects.baseimportIndexObject`
	`38`	`+fromgit.objects.commitimportCommit`
	`39`	`+fromgit.objects.treeimportTree`
	`40`	`+fromgit.repo.baseimportRepo`
`40`	`41`
`41`	`42`	`Lit_change_type=Literal["A","D","C","M","R","T","U"]`
`42`	`43`
`43`	`44`	`# ------------------------------------------------------------------------`
`44`	`45`
`45`	`46`
`46`		`-__all__= ("DiffConstants","NULL_TREE","INDEX","Diffable","DiffIndex","Diff")`
`47`		`-`
`48`		`-`
`49`	`47`	`@enum.unique`
`50`	`48`	`classDiffConstants(enum.Enum):`
`51`	`49`	"""Special objects for :meth:`Diffable.diff`.

`‎git/exc.py`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,14 @@`
`42`	`42`	`ParseError,`
`43`	`43`	`UnsupportedOperation,`
`44`	`44`	`)`
	`45`	`+`
`45`	`46`	`fromgit.compatimportsafe_decode`
`46`	`47`	`fromgit.utilimportremove_password_if_present`
`47`	`48`
`48`	`49`	`# typing ----------------------------------------------------`
`49`	`50`
`50`		`-fromtypingimportList,Sequence,Tuple,Union,TYPE_CHECKING`
	`51`	`+fromtypingimportList,Sequence,Tuple,TYPE_CHECKING,Union`
	`52`	`+`
`51`	`53`	`fromgit.typesimportPathLike`
`52`	`54`
`53`	`55`	`ifTYPE_CHECKING:`

`‎git/remote.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`"""Module implementing a remote object allowing easy access to git remotes."""`
`7`	`7`
	`8`	`+__all__= ("RemoteProgress","PushInfo","FetchInfo","Remote")`
	`9`	`+`
`8`	`10`	`importcontextlib`
`9`	`11`	`importlogging`
`10`	`12`	`importre`
`@@ -54,8 +56,6 @@`
`54`	`56`
`55`	`57`	`_logger=logging.getLogger(__name__)`
`56`	`58`
`57`		`-__all__= ("RemoteProgress","PushInfo","FetchInfo","Remote")`
`58`		`-`
`59`	`59`	`# { Utilities`
`60`	`60`
`61`	`61`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit3d4e476

File tree

6 files changed

6 files changed

`‎git/cmd.py`

`‎git/config.py`

`‎git/db.py`

`‎git/diff.py`

`‎git/exc.py`

`‎git/remote.py`

0 commit comments