Revert of Fix pylint warnings in webkitpy/common/.

third_party/WebKit/Tools/Scripts/webkitpy/common/system/filesystem_mock.py

 # Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 14 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import StringIO
 import errno
 import hashlib
 import os
 import re
 
+from webkitpy.common.system import path
+
 
 class MockFileSystem(object):
     sep = '/'
     pardir = '..'
 
     def __init__(self, files=None, dirs=None, cwd='/'):
         """Initializes a "mock" filesystem that can be used to completely
         stub out a filesystem.
 
         Args:
@@ skipping 72 matching lines @@
 
         self.files[destination] = self.files[source]
         self.written_files[destination] = self.files[source]
 
     def dirname(self, path):
         return self._split(path)[0]
 
     def exists(self, path):
         return self.isfile(path) or self.isdir(path)
 
-    def files_under(self, path, dirs_to_skip=None, file_filter=None):
-        dirs_to_skip = dirs_to_skip or []
-
-        def filter_all(*_):
+    def files_under(self, path, dirs_to_skip=[], file_filter=None):
+        def filter_all(fs, dirpath, basename):
             return True
 
         file_filter = file_filter or filter_all
         files = []
         if self.isfile(path):
             if file_filter(self, self.dirname(path), self.basename(path)) and self.files[path] is not None:
                 files.append(path)
             return files
 
         if self.basename(path) in dirs_to_skip:
@@ skipping 67 matching lines @@
         return dirs + files
 
     def walk(self, top):
         sep = self.sep
         if not self.isdir(top):
             raise OSError("%s is not a directory" % top)
 
         if not top.endswith(sep):
             top += sep
 
-        directories = []
+        dirs = []
         files = []
         for f in self.files:
             if self.exists(f) and f.startswith(top):
                 remaining = f[len(top):]
                 if sep in remaining:
-                    directory = remaining[:remaining.index(sep)]
-                    if directory not in directories:
-                        directories.append(directory)
+                    dir = remaining[:remaining.index(sep)]
+                    if not dir in dirs:
+                        dirs.append(dir)
                 else:
                     files.append(remaining)
-        file_system_tuples = [(top[:-1], directories, files)]
-        for directory in directories:
-            directory = top + directory
-            tuples_from_subdirs = self.walk(directory)
+        file_system_tuples = [(top[:-1], dirs, files)]
+        for dir in dirs:
+            dir = top + dir
+            tuples_from_subdirs = self.walk(dir)
             file_system_tuples += tuples_from_subdirs
         return file_system_tuples
 
     def mtime(self, path):
         if self.exists(path):
             return 0
         self._raise_not_found(path)
 
-    def _mktemp(self, suffix='', prefix='tmp', directory=None, **_):
-        if directory is None:
-            directory = self.sep + '__im_tmp'
+    def _mktemp(self, suffix='', prefix='tmp', dir=None, **kwargs):
+        if dir is None:
+            dir = self.sep + '__im_tmp'
         curno = self.current_tmpno
         self.current_tmpno += 1
-        self.last_tmpdir = self.join(directory, '%s_%u_%s' % (prefix, curno, suffix))
+        self.last_tmpdir = self.join(dir, '%s_%u_%s' % (prefix, curno, suffix))
         return self.last_tmpdir
 
     def mkdtemp(self, **kwargs):
         class TemporaryDirectory(object):
 
             def __init__(self, fs, **kwargs):
                 self._kwargs = kwargs
                 self._filesystem = fs
                 self._directory_path = fs._mktemp(**kwargs)
                 fs.maybe_make_directory(self._directory_path)
 
             def __str__(self):
                 return self._directory_path
 
             def __enter__(self):
                 return self._directory_path
 
-            def __exit__(self, *_):
+            def __exit__(self, type, value, traceback):
                 # Only self-delete if necessary.
 
                 # FIXME: Should we delete non-empty directories?
                 if self._filesystem.exists(self._directory_path):
                     self._filesystem.rmtree(self._directory_path)
 
         return TemporaryDirectory(fs=self, **kwargs)
 
     def maybe_make_directory(self, *path):
         norm_path = self.normpath(self.join(*path))
@@ skipping 116 matching lines @@
 
     def rmtree(self, path):
         path = self.normpath(path)
 
         for f in self.files:
             # We need to add a trailing separator to path to avoid matching
             # cases like path='/foo/b' and f='/foo/bar/baz'.
             if f == path or f.startswith(path + self.sep):
                 self.files[f] = None
 
-        self.dirs = {d for d in self.dirs if not (d == path or d.startswith(path + self.sep))}
+        self.dirs = set(filter(lambda d: not (d == path or d.startswith(path + self.sep)), self.dirs))
 
     def copytree(self, source, destination):
         source = self.normpath(source)
         destination = self.normpath(destination)
 
         for source_file in list(self.files):
             if source_file.startswith(source):
                 destination_path = self.join(destination, self.relpath(source_file, source))
                 self.maybe_make_directory(self.dirname(destination_path))
                 self.files[destination_path] = self.files[source_file]
@@ skipping 15 matching lines @@
 
     def __init__(self, fs, path):
         self.fs = fs
         self.path = path
         self.closed = False
         self.fs.files[path] = ""
 
     def __enter__(self):
         return self
 
-    def __exit__(self, *_):
+    def __exit__(self, type, value, traceback):
         self.close()
 
     def close(self):
         self.closed = True
 
-    def write(self, string):
-        self.fs.files[self.path] += string
+    def write(self, str):
+        self.fs.files[self.path] += str
         self.fs.written_files[self.path] = self.fs.files[self.path]
 
 
 class WritableTextFileObject(WritableBinaryFileObject):
 
-    def write(self, string):
-        WritableBinaryFileObject.write(self, string.encode('utf-8'))
+    def write(self, str):
+        WritableBinaryFileObject.write(self, str.encode('utf-8'))
 
 
 class ReadableBinaryFileObject(object):
 
     def __init__(self, fs, path, data):
         self.fs = fs
         self.path = path
         self.closed = False
         self.data = data
         self.offset = 0
 
     def __enter__(self):
         return self
 
-    def __exit__(self, *_):
+    def __exit__(self, type, value, traceback):
         self.close()
 
     def close(self):
         self.closed = True
 
-    def read(self, num_bytes=None):
-        if not num_bytes:
+    def read(self, bytes=None):
+        if not bytes:
             return self.data[self.offset:]
         start = self.offset
-        self.offset += num_bytes
+        self.offset += bytes
         return self.data[start:self.offset]
 
 
 class ReadableTextFileObject(ReadableBinaryFileObject):
 
     def __init__(self, fs, path, data):
         super(ReadableTextFileObject, self).__init__(fs, path, StringIO.StringIO(data.decode("utf-8")))
 
     def close(self):
         self.data.close()
         super(ReadableTextFileObject, self).close()
 
-    def read(self, num_bytes=-1):
-        return self.data.read(num_bytes)
+    def read(self, bytes=-1):
+        return self.data.read(bytes)
 
     def readline(self, length=None):
         return self.data.readline(length)
 
     def __iter__(self):
         return self.data.__iter__()
 
     def next(self):
         return self.data.next()
 
     def seek(self, offset, whence=os.SEEK_SET):
         self.data.seek(offset, whence)