Revert r80770 "Switch from xml.dom.minidom to xml.etree"

presubmit_canned_checks.py

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generic presubmit checks that can be reused by other presubmit checks."""
 
 
 ### Description checks
 
 def CheckChangeHasTestField(input_api, output_api):
@@ skipping 526 matching lines @@
       if Find(filepath, white_list) and not Find(filepath, black_list):
         files.append(filepath)
   return files
 
 
 def RunPylint(input_api, output_api, white_list=None, black_list=None):
   """Run pylint on python files.
 
   The default white_list enforces looking only a *.py files.
   """
-  verbose = False
   white_list = white_list or ['.*\.py$']
   black_list = black_list or input_api.DEFAULT_BLACK_LIST
-  if input_api.is_committing:
-    error_type = output_api.PresubmitError
-  else:
-    error_type = output_api.PresubmitPromptWarning
 
   # Only trigger if there is at least one python file affected.
   src_filter = lambda x: input_api.FilterSourceFile(x, white_list, black_list)
   if not input_api.AffectedSourceFiles(src_filter):
     return []
 
   # On certain pylint/python version combination, running pylint throws a lot of
   # warning messages.
   import warnings
   warnings.filterwarnings('ignore', category=DeprecationWarning)
   try:
     files = _FetchAllFiles(input_api, white_list, black_list)
     if not files:
       return []
     # Now that at least one python file was modified and all the python files
     # were listed, try to run pylint.
     try:
       from pylint import lint
+      result = lint.Run(sorted(files))
+    except SystemExit, e:
+      # pylint has the bad habit of calling sys.exit(), trap it here.
+      result = e.code
     except ImportError:
       if input_api.platform == 'win32':
         return [output_api.PresubmitNotifyResult(
           'Warning: Can\'t run pylint because it is not installed. Please '
           'install manually\n'
           'Cannot do static analysis of python files.')]
       return [output_api.PresubmitError(
           'Please install pylint with "sudo apt-get install python-setuptools; '
           'sudo easy_install pylint"\n'
           'or visit http://pypi.python.org/pypi/setuptools.\n'
           'Cannot do static analysis of python files.')]
-
-    def run_lint(files):
-      try:
-        lint.Run(files)
-        assert False
-      except SystemExit, e:
-        # pylint has the bad habit of calling sys.exit(), trap it here.
-        return e.code
-
-    result = None
-    if not verbose:
-      result = run_lint(sorted(files))
-    else:
-      for filename in sorted(files):
-        print('Running pylint on %s' % filename)
-        out = run_lint([filename])
-        if out:
-          result = out
     if result:
+      if input_api.is_committing:
+        error_type = output_api.PresubmitError
+      else:
+        error_type = output_api.PresubmitPromptWarning
       return [error_type('Fix pylint errors first.')]
     return []
   finally:
     warnings.filterwarnings('default', category=DeprecationWarning)
 
-
 # TODO(dpranke): Get the host_url from the input_api instead
 def CheckRietveldTryJobExecution(input_api, output_api, host_url, platforms,
                                  owner):
   if not input_api.is_committing:
     return []
   if not input_api.change.issue or not input_api.change.patchset:
     return []
   url = '%s/%d/get_build_results/%d' % (
       host_url, input_api.change.issue, input_api.change.patchset)
   try:
@@ skipping 277 matching lines @@
       input_api, output_api, source_file_filter=text_files))
   results.extend(input_api.canned_checks.CheckSvnForCommonMimeTypes(
       input_api, output_api))
   results.extend(input_api.canned_checks.CheckLicense(
       input_api, output_api, license_header, source_file_filter=sources))
   results.extend(_CheckConstNSObject(
       input_api, output_api, source_file_filter=sources))
   results.extend(_CheckSingletonInHeaders(
       input_api, output_api, source_file_filter=sources))
   return results