Merge remote branch 'cros/upstream' into master

utils/run_pylint.py

 #!/usr/bin/python -u
 
 import os, sys, fnmatch
 import common
 
 # do a basic check to see if pylint is even installed
 try:
     import pylint
+    from pylint.__pkginfo__ import version as pylint_version
 except ImportError:
     print "Unable to import pylint, it may need to be installed"
     sys.exit(1)
 
+major, minor, release = pylint_version.split('.')
+pylint_version = float("%s.%s" % (major, minor))
 pylintrc_path = os.path.expanduser('~/.pylintrc')
 if not os.path.exists(pylintrc_path):
     open(pylintrc_path, 'w').close()
 
 
 # patch up the logilab module lookup tools to understand autotest_lib.* trash
 import logilab.common.modutils
 _ffm = logilab.common.modutils.file_from_modpath
 def file_from_modpath(modpath, path=None, context_file=None):
     if modpath[0] == "autotest_lib":
@@ skipping 24 matching lines @@
 imports.ImportsChecker = CustomImportsChecker
 
 # some files make pylint blow up, so make sure we ignore them
 blacklist = ['/contrib/*', '/frontend/afe/management.py']
 
 # only show errors
 # there are two major sources of E1101/E1103 false positives:
 # * common_lib.enum.Enum objects
 # * DB model objects (scheduler models are the worst, but Django models also
 #   generate some errors)
-pylint_base_opts = ['--disable-msg-cat=warning,refactor,convention',
-                    '--disable-msg=E1101,E1103',
-                    '--reports=no',
-                    '--include-ids=y']
+if pylint_version >= 0.21:
+    pylint_base_opts = ['--disable=W,R,C,E1101,E1103']
+else:
+    pylint_base_opts = ['--disable-msg-cat=warning,refactor,convention',
+                        '--disable-msg=E1101,E1103']
+pylint_base_opts += ['--reports=no',
+                     '--include-ids=y']
 
 file_list = sys.argv[1:]
 if '--' in file_list:
     index = file_list.index('--')
     pylint_base_opts.extend(file_list[index+1:])
     file_list = file_list[:index]
 
 
 def check_file(file_path):
     if not file_path.endswith('.py'):
@@ skipping 15 matching lines @@
 
 
 if len(file_list) > 0:
     for path in file_list:
         if os.path.isdir(path):
             check_dir(path)
         else:
             check_file(path)
 else:
     check_dir('.')