Fix pylint warnings in test_importer.py.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py

 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the above
 #    copyright notice, this list of conditions and the following
 #    disclaimer.
 # 2. Redistributions in binary form must reproduce the above
@@ skipping 112 matching lines @@
                             'By default, they will be overwritten.'))
     parser.add_option('-a', '--all', action='store_true', default=False,
                       help=('Import all tests including reftests, JS tests, and manual/pixel tests. '
                             'By default, only reftests and JS tests are imported.'))
     parser.add_option('-d', '--dest-dir', dest='destination', default='w3c',
                       help=('Import into a specified directory relative to the LayoutTests root. '
                             'By default, files are imported under LayoutTests/w3c.'))
     parser.add_option('--ignore-expectations', action='store_true', default=False,
                       help='Ignore the W3CImportExpectations file and import everything.')
     parser.add_option('--dry-run', action='store_true', default=False,
-                      help='Dryrun only (don\'t actually write any results).')
+                      help='Dry run only (don\'t actually write any results).')
 
     options, args = parser.parse_args()
     if len(args) != 1:
         parser.error('Incorrect number of arguments; source repo path is required.')
     return options, args
 
 
 class TestImporter(object):
 
     def __init__(self, host, source_repo_path, options):
@@ skipping 34 matching lines @@
 
         for root, dirs, files in self.filesystem.walk(self.source_repo_path):
             cur_dir = root.replace(self.dir_above_repo + '/', '') + '/'
             _log.info('  scanning ' + cur_dir + '...')
             total_tests = 0
             reftests = 0
             jstests = 0
 
             # Files in 'tools' are not for browser testing, so we skip them.
             # See: http://testthewebforward.org/docs/test-format-guidelines.html#tools
-            DIRS_TO_SKIP = ('.git', 'test-plan', 'tools')
+            dirs_to_skip = ('.git', 'test-plan', 'tools')
 
             # We copy all files in 'support', including HTML without metadata.
             # See: http://testthewebforward.org/docs/test-format-guidelines.html#support-files
-            DIRS_TO_INCLUDE = ('resources', 'support')
+            dirs_to_include = ('resources', 'support')
 
             if dirs:
-                for d in DIRS_TO_SKIP:
-                    if d in dirs:
-                        dirs.remove(d)
+                for name in dirs_to_skip:
+                    if name in dirs:
+                        dirs.remove(name)
 
                 for path in paths_to_skip:
                     path_base = path.replace(self.options.destination + '/', '')
                     path_base = path_base.replace(cur_dir, '')
                     path_full = self.filesystem.join(root, path_base)
                     if path_base in dirs:
                         dirs.remove(path_base)
                         if not self.options.dry_run and self.import_in_place:
                             _log.info("  pruning %s", path_base)
                             self.filesystem.rmtree(path_full)
@@ skipping 25 matching lines @@
 
                 fullpath = self.filesystem.join(root, filename)
 
                 mimetype = mimetypes.guess_type(fullpath)
                 if ('html' not in str(mimetype[0]) and
                         'application/xhtml+xml' not in str(mimetype[0]) and
                         'application/xml' not in str(mimetype[0])):
                     copy_list.append({'src': fullpath, 'dest': filename})
                     continue
 
-                if self.filesystem.basename(root) in DIRS_TO_INCLUDE:
+                if self.filesystem.basename(root) in dirs_to_include:
                     copy_list.append({'src': fullpath, 'dest': filename})
                     continue
 
                 test_parser = TestParser(fullpath, self.host)
                 test_info = test_parser.analyze_test()
                 if test_info is None:
                     copy_list.append({'src': fullpath, 'dest': filename})
                     continue
 
                 if self.path_too_long(path_full):
@@ skipping 189 matching lines @@
         """Checks whether a source path is too long to import.
 
         Args:
             Absolute path of file to be imported.
 
         Returns:
             True if the path is too long to import, False if it's OK.
         """
         path_from_repo_base = os.path.relpath(source_path, self.source_repo_path)
         return len(path_from_repo_base) > MAX_PATH_LENGTH