Commit 10aa3b2

committed

Improve ordering/grouping of a few imports

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

1 parent 5944d09 commit 10aa3b2Copy full SHA for 10aa3b2

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`	`+import os.path as osp`
	`7`	`+from pathlib import Path`
`6`	`8`	`import random`
`7`	`9`	`import tempfile`
`8`		`-import pytest`
`9`	`10`	`from unittest import skipIf`
`10`	`11`
	`12`	`+import pytest`
	`13`	`+`
`11`	`14`	`from git import (`
`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`	`from git.cmd import Git`
`25`		`-from pathlib import Path`
`26`	`28`	`from git.exc import UnsafeOptionError, UnsafeProtocolError`
	`29`	`+from git.util import rmtree, HIDE_WINDOWS_FREEZE_ERRORS, IterableList`
`27`	`30`	`from test.lib import (`
	`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`		`-from git.util import rmtree, HIDE_WINDOWS_FREEZE_ERRORS, IterableList`
`35`		`-import os.path as osp`
`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`	`from io import BytesIO`
`9`	`9`	`import itertools`
`10`	`10`	`import os`
	`11`	`+import os.path as osp`
`11`	`12`	`import pathlib`
`12`	`13`	`import pickle`
`13`	`14`	`import sys`
`@@ -17,22 +18,22 @@`
`17`	`18`	`import pytest`
`18`	`19`
`19`	`20`	`from git import (`
	`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`	`from git.exc import (`
`38`	`39`	`BadObject,`
`@@ -43,8 +44,6 @@`
`43`	`44`	`from git.util import bin_to_hex, cygpath, join_path_native, rmfile, rmtree`
`44`	`45`	`from test.lib import TestBase, fixture, with_rw_directory, with_rw_repo`
`45`	`46`
`46`		`-import os.path as osp`
`47`		`-`
`48`	`47`
`49`	`48`	`def iter_flatten(lol):`
`50`	`49`	`for items in lol:`

Comments

(0)