From 167b9e63c706dfcfe8eab18256b5136e9aa7d9be Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 17 Sep 2009 17:41:02 +0000 Subject: [PATCH] Fix PyChecker errors caused by r26423. Patch contributed by msb@ TEST=unit test BUG=none Review url: http://codereview.chromium.org/213006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26457 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient.py | 10 +++++----- gclient_utils.py | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gclient.py b/gclient.py index e56a56ac9..bc70ccb81 100755 --- a/gclient.py +++ b/gclient.py @@ -74,7 +74,6 @@ import os import re import stat import sys -import time import urlparse import urllib @@ -749,7 +748,7 @@ class GClient(object): # Use entry and not entry_fixed there. if entry not in entries and os.path.exists(e_dir): if not self._options.delete_unversioned_trees or \ - CaptureSVNStatus(e_dir): + gclient_scm.CaptureSVNStatus(e_dir): # There are modified files in this entry. Keep warning until # removed. entries[entry] = None @@ -808,7 +807,8 @@ class GClient(object): return (original_url, int(revision_overrides[name])) else: # TODO(aharper): SVN/SCMWrapper cleanup (non-local commandset) - return (original_url, CaptureSVNHeadRevision(original_url)) + return (original_url, + gclient_scm.CaptureSVNHeadRevision(original_url)) else: url_components = original_url.split("@") if revision_overrides.has_key(name): @@ -824,7 +824,7 @@ class GClient(object): (url, rev) = GetURLAndRev(name, solution["url"]) entries[name] = "%s@%d" % (url, rev) # TODO(aharper): SVN/SCMWrapper cleanup (non-local commandset) - entries_deps_content[name] = CaptureSVN( + entries_deps_content[name] = gclient_scm.CaptureSVN( ["cat", "%s/%s@%d" % (url, self._options.deps_file, @@ -851,7 +851,7 @@ class GClient(object): raise Error("From %s missing revisioned url" % deps[d].module_name) deps_parent_url_components = deps_parent_url.split("@") # TODO(aharper): SVN/SCMWrapper cleanup (non-local commandset) - deps_parent_content = CaptureSVN( + deps_parent_content = gclient_scm.CaptureSVN( ["cat", "%s/%s@%s" % (deps_parent_url_components[0], self._options.deps_file, diff --git a/gclient_utils.py b/gclient_utils.py index 1b11f96ae..464419fb0 100644 --- a/gclient_utils.py +++ b/gclient_utils.py @@ -12,11 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +import errno import os import stat import subprocess import sys +import time import xml.dom.minidom +import xml.parsers.expat ## Generic utils