From e00aa6b923d28a3c910f85e7726e4ba1d2a9aebd Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 11 Sep 2012 14:33:51 +0900 Subject: Clean up imports manifest_xml: import `HEAD` and `R_HEADS` from correct module version: import `HEAD` from correct module `HEAD` and `R_HEADS` should be imported from the git_refs module, where they are originally defined, rather than from the project module. repo: remove unused import of readline cherry_pick: import standard modules on separate lines smartsync: import subcmd modules explicitly from subcmd Use: `import re import sys` and `from subcmds.sync import Sync` Instead of: `import sys, re` and `from sync import Sync` Change-Id: Ie10dd6832710939634c4f5c86b9ba5a9cd6fc92e --- subcmds/cherry_pick.py | 3 ++- subcmds/smartsync.py | 2 +- subcmds/version.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'subcmds') diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py index 7890af4d..7a6d4c20 100644 --- a/subcmds/cherry_pick.py +++ b/subcmds/cherry_pick.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys, re +import re +import sys from command import Command from git_command import GitCommand diff --git a/subcmds/smartsync.py b/subcmds/smartsync.py index 1edbd35b..e164859f 100644 --- a/subcmds/smartsync.py +++ b/subcmds/smartsync.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from sync import Sync +from subcmds.sync import Sync class Smartsync(Sync): common = True diff --git a/subcmds/version.py b/subcmds/version.py index 03195f88..243e3676 100644 --- a/subcmds/version.py +++ b/subcmds/version.py @@ -16,7 +16,7 @@ import sys from command import Command, MirrorSafeCommand from git_command import git -from project import HEAD +from git_refs import HEAD class Version(Command, MirrorSafeCommand): wrapper_version = None -- cgit v1.2.3-54-g00ecf