Commit799c853

committed

Improve ordering/grouping of a few imports

In modules soon to be modified, so if subsequent commits are laterreverted, these import tweaks are not automatically undone.

1 parent4abab92 commit799c853Copy full SHA for 799c853

File tree

+26

-26

lines changed

+26

-26

lines changed

Lines changed: 14 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,36 +3,37 @@`
`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`	`+importos.pathasosp`
	`7`	`+frompathlibimportPath`
`6`	`8`	`importrandom`
`7`	`9`	`importtempfile`
`8`		`-importpytest`
`9`	`10`	`fromunittestimportskipIf`
`10`	`11`
	`12`	`+importpytest`
	`13`	`+`
`11`	`14`	`fromgitimport (`
`12`		`-RemoteProgress,`
	`15`	`+Commit,`
`13`	`16`	`FetchInfo,`
`14`		`-Reference,`
`15`		`-SymbolicReference,`
	`17`	`+GitCommandError,`
`16`	`18`	`Head,`
`17`		`-Commit,`
`18`	`19`	`PushInfo,`
	`20`	`+Reference,`
	`21`	`+Remote,`
	`22`	`+RemoteProgress,`
`19`	`23`	`RemoteReference,`
	`24`	`+SymbolicReference,`
`20`	`25`	`TagReference,`
`21`		`-Remote,`
`22`		`-GitCommandError,`
`23`	`26`	`)`
`24`	`27`	`fromgit.cmdimportGit`
`25`		`-frompathlibimportPath`
`26`	`28`	`fromgit.excimportUnsafeOptionError,UnsafeProtocolError`
	`29`	`+fromgit.utilimportrmtree,HIDE_WINDOWS_FREEZE_ERRORS,IterableList`
`27`	`30`	`fromtest.libimport (`
	`31`	`+GIT_DAEMON_PORT,`
`28`	`32`	`TestBase,`
`29`		`-with_rw_repo,`
`30`		`-with_rw_and_rw_remote_repo,`
`31`	`33`	`fixture,`
`32`		`-GIT_DAEMON_PORT,`
	`34`	`+with_rw_and_rw_remote_repo,`
	`35`	`+with_rw_repo,`
`33`	`36`	`)`
`34`		`-fromgit.utilimportrmtree,HIDE_WINDOWS_FREEZE_ERRORS,IterableList`
`35`		`-importos.pathasosp`
`36`	`37`
`37`	`38`
`38`	`39`	`# Make sure we have repeatable results.`

Lines changed: 12 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`fromioimportBytesIO`
`9`	`9`	`importitertools`
`10`	`10`	`importos`
	`11`	`+importos.pathasosp`
`11`	`12`	`importpathlib`
`12`	`13`	`importpickle`
`13`	`14`	`importsys`
`@@ -17,22 +18,22 @@`
`17`	`18`	`importpytest`
`18`	`19`
`19`	`20`	`fromgitimport (`
	`21`	`+BadName,`
	`22`	`+Commit,`
	`23`	`+Git,`
	`24`	`+GitCmdObjectDB,`
	`25`	`+GitCommandError,`
	`26`	`+GitDB,`
	`27`	`+Head,`
	`28`	`+IndexFile,`
`20`	`29`	`InvalidGitRepositoryError,`
`21`		`-Repo,`
`22`	`30`	`NoSuchPathError,`
`23`		`-Head,`
`24`		`-Commit,`
`25`	`31`	`Object,`
`26`		`-Tree,`
`27`		`-IndexFile,`
`28`		`-Git,`
`29`	`32`	`Reference,`
`30`		`-GitDB,`
`31`		`-Submodule,`
`32`		`-GitCmdObjectDB,`
`33`	`33`	`Remote,`
`34`		`-BadName,`
`35`		`-GitCommandError,`
	`34`	`+Repo,`
	`35`	`+Submodule,`
	`36`	`+Tree,`
`36`	`37`	`)`
`37`	`38`	`fromgit.excimport (`
`38`	`39`	`BadObject,`
`@@ -43,8 +44,6 @@`
`43`	`44`	`fromgit.utilimportbin_to_hex,cygpath,join_path_native,rmfile,rmtree`
`44`	`45`	`fromtest.libimportTestBase,fixture,with_rw_directory,with_rw_repo`
`45`	`46`
`46`		`-importos.pathasosp`
`47`		`-`
`48`	`47`
`49`	`48`	`defiter_flatten(lol):`
`50`	`49`	`foritemsinlol:`

Comments

(0)