Revert of Fix pylint warnings in webkitpy/common/.

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

 # Copyright (C) 2011 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 13 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # 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 platform
 import sys
 import unittest
 
 from webkitpy.common.system.executive import Executive
+from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.common.system.filesystem import FileSystem
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.platforminfo import PlatformInfo
 
 
 def fake_sys(platform_str='darwin', windows_version_tuple=None):
 
     class FakeSysModule(object):
         platform = platform_str
@@ skipping 127 matching lines @@
                           executive=fake_executive('6.1.1234'))
         self.assertEqual(self.make_info(fake_sys('cygwin'), executive=fake_executive('10.1.1234')).os_version, 'future')
         self.assertEqual(self.make_info(fake_sys('cygwin'), executive=fake_executive('10.0.1234')).os_version, '10')
         self.assertEqual(self.make_info(fake_sys('cygwin'), executive=fake_executive('6.3.1234')).os_version, '8.1')
         self.assertEqual(self.make_info(fake_sys('cygwin'), executive=fake_executive('6.2.1234')).os_version, '8')
         self.assertEqual(self.make_info(fake_sys('cygwin'), executive=fake_executive('6.1.7601')).os_version, '7sp1')
         self.assertEqual(self.make_info(fake_sys('cygwin'), executive=fake_executive('6.1.7600')).os_version, '7sp0')
         self.assertEqual(self.make_info(fake_sys('cygwin'), executive=fake_executive('6.0.1234')).os_version, 'vista')
         self.assertEqual(self.make_info(fake_sys('cygwin'), executive=fake_executive('5.1.1234')).os_version, 'xp')
 
-    def _assert_file_implies_linux_distribution(self, filename, distribution):
-        info = self.make_info(sys_module=fake_sys('linux2'), filesystem_module=MockFileSystem({filename: ''}))
+    def _assert_file_implies_linux_distribution(self, file, distribution):
+        info = self.make_info(sys_module=fake_sys('linux2'), filesystem_module=MockFileSystem({file: ''}))
         self.assertEqual(info.linux_distribution(), distribution)
 
     def test_linux_distro_detection(self):
         self._assert_file_implies_linux_distribution('/etc/arch-release', 'arch')
         self._assert_file_implies_linux_distribution('/etc/debian_version', 'debian')
         self._assert_file_implies_linux_distribution('/etc/redhat-release', 'redhat')
         self._assert_file_implies_linux_distribution('/etc/mock-release', 'unknown')
 
         info = self.make_info(fake_sys('cygwin'), executive=fake_executive('6.1.7600'))
         self.assertIsNone(info.linux_distribution())
@@ skipping 16 matching lines @@
         self.assertEqual(info.total_bytes_memory(), 1234)
 
         info = self.make_info(fake_sys('win32', tuple([6, 1, 7600])))
         self.assertIsNone(info.total_bytes_memory())
 
         info = self.make_info(fake_sys('linux2'))
         self.assertIsNone(info.total_bytes_memory())
 
         info = self.make_info(fake_sys('freebsd9'))
         self.assertIsNone(info.total_bytes_memory())