android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up imports

Browse Source 
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
This commit is contained in:
David Pursehouse 2012-09-11 14:33:51 +09:00 committed by Gustaf Lundh
parent 86d973d24e
commit e00aa6b923
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifest_xml.py
View File

@ -21,7 +21,8 @@ import urlparse
import xml.dom.minidom import xml.dom.minidom
from git_config import GitConfig from git_config import GitConfig
from project import RemoteSpec, Project, MetaProject, R_HEADS, HEAD from git_refs import R_HEADS, HEAD
from project import RemoteSpec, Project, MetaProject
from error import ManifestParseError from error import ManifestParseError
MANIFEST_FILE_NAME = 'manifest.xml' MANIFEST_FILE_NAME = 'manifest.xml'

1
repo
View File

@ -88,7 +88,6 @@ REPO_MAIN = S_repo + '/main.py' # main script
import optparse import optparse
import os import os
import re import re
import readline
import subprocess import subprocess
import sys import sys
import urllib2 import urllib2

3
subcmds/cherry_pick.py
View File

@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import sys, re import re
import sys
from command import Command from command import Command
from git_command import GitCommand from git_command import GitCommand

2
subcmds/smartsync.py
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from sync import Sync from subcmds.sync import Sync
class Smartsync(Sync): class Smartsync(Sync):
common = True common = True

2
subcmds/version.py
View File

@ -16,7 +16,7 @@
import sys import sys
from command import Command, MirrorSafeCommand from command import Command, MirrorSafeCommand
from git_command import git from git_command import git
from project import HEAD from git_refs import HEAD
class Version(Command, MirrorSafeCommand): class Version(Command, MirrorSafeCommand):
wrapper_version = None wrapper_version = None