Revert of Fix pylint warnings in webkitpy/common/.

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

 # Copyright (C) 2010 Research in Motion Ltd. 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 18 matching lines @@
 import unittest
 
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.user import User
 
 
 class UserTest(unittest.TestCase):
 
     example_user_response = "example user response"
 
-    def setUp(self):
-        self.repeats_remaining = None
+    def test_prompt_repeat(self):
+        self.repeatsRemaining = 2
 
-    def test_prompt_repeat(self):
-        self.repeats_remaining = 2
-
-        def mock_raw_input(_):
-            self.repeats_remaining -= 1
-            if not self.repeats_remaining:
+        def mock_raw_input(message):
+            self.repeatsRemaining -= 1
+            if not self.repeatsRemaining:
                 return UserTest.example_user_response
             return None
-        self.assertEqual(User.prompt("input", repeat=self.repeats_remaining,
-                                     raw_input_func=mock_raw_input), UserTest.example_user_response)
+        self.assertEqual(User.prompt("input", repeat=self.repeatsRemaining,
+                                     raw_input=mock_raw_input), UserTest.example_user_response)
 
     def test_prompt_when_exceeded_repeats(self):
-        self.repeats_remaining = 2
+        self.repeatsRemaining = 2
 
-        def mock_raw_input(_):
-            self.repeats_remaining -= 1
+        def mock_raw_input(message):
+            self.repeatsRemaining -= 1
             return None
-        self.assertIsNone(User.prompt("input", repeat=self.repeats_remaining, raw_input_func=mock_raw_input))
+        self.assertIsNone(User.prompt("input", repeat=self.repeatsRemaining, raw_input=mock_raw_input))
 
     def test_prompt_with_multiple_lists(self):
         def run_prompt_test(inputs, expected_result, can_choose_multiple=False):
-            def mock_raw_input(_):
+            def mock_raw_input(message):
                 return inputs.pop(0)
             output_capture = OutputCapture()
             actual_result = output_capture.assert_outputs(
                 self,
                 User.prompt_with_multiple_lists,
                 args=["title", ["subtitle1", "subtitle2"], [["foo", "bar"], ["foobar", "barbaz", "foobaz"]]],
-                kwargs={"can_choose_multiple": can_choose_multiple, "raw_input_func": mock_raw_input},
+                kwargs={"can_choose_multiple": can_choose_multiple, "raw_input": mock_raw_input},
                 expected_stdout="title\n\nsubtitle1\n 1. foo\n 2. bar\n\nsubtitle2\n 3. foobar\n 4. barbaz\n 5. foobaz\n")
             self.assertEqual(actual_result, expected_result)
             self.assertEqual(len(inputs), 0)
 
         run_prompt_test(["1"], "foo")
         run_prompt_test(["badinput", "2"], "bar")
         run_prompt_test(["3"], "foobar")
         run_prompt_test(["4"], "barbaz")
         run_prompt_test(["5"], "foobaz")
 
         run_prompt_test(["1,2"], ["foo", "bar"], can_choose_multiple=True)
         run_prompt_test(["1-3"], ["foo", "bar", "foobar"], can_choose_multiple=True)
         run_prompt_test(["1-2,3"], ["foo", "bar", "foobar"], can_choose_multiple=True)
         run_prompt_test(["2-1,3"], ["foobar"], can_choose_multiple=True)
         run_prompt_test(["  1,  2   "], ["foo", "bar"], can_choose_multiple=True)
         run_prompt_test(["all"], ["foo", "bar", 'foobar', 'barbaz', 'foobaz'], can_choose_multiple=True)
         run_prompt_test([""], ["foo", "bar", 'foobar', 'barbaz', 'foobaz'], can_choose_multiple=True)
         run_prompt_test(["  "], ["foo", "bar", 'foobar', 'barbaz', 'foobaz'], can_choose_multiple=True)
         run_prompt_test(["badinput", "all"], ["foo", "bar", 'foobar', 'barbaz', 'foobaz'], can_choose_multiple=True)
 
     def test_prompt_with_list(self):
         def run_prompt_test(inputs, expected_result, can_choose_multiple=False):
-            def mock_raw_input(_):
+            def mock_raw_input(message):
                 return inputs.pop(0)
             output_capture = OutputCapture()
             actual_result = output_capture.assert_outputs(
                 self,
                 User.prompt_with_list,
                 args=["title", ["foo", "bar"]],
-                kwargs={"can_choose_multiple": can_choose_multiple, "raw_input_func": mock_raw_input},
+                kwargs={"can_choose_multiple": can_choose_multiple, "raw_input": mock_raw_input},
                 expected_stdout="title\n 1. foo\n 2. bar\n")
             self.assertEqual(actual_result, expected_result)
             self.assertEqual(len(inputs), 0)
 
         run_prompt_test(["1"], "foo")
         run_prompt_test(["badinput", "2"], "bar")
 
         run_prompt_test(["1,2"], ["foo", "bar"], can_choose_multiple=True)
         run_prompt_test(["  1,  2   "], ["foo", "bar"], can_choose_multiple=True)
         run_prompt_test(["all"], ["foo", "bar"], can_choose_multiple=True)
@@ skipping 13 matching lines @@
             (("Continue? [y/N]: ", False), (User.DEFAULT_NO, 'q')),
         )
         for test_case in test_cases:
             expected, inputs = test_case
 
             def mock_raw_input(message):
                 self.assertEqual(expected[0], message)
                 return inputs[1]
 
             result = User().confirm(default=inputs[0],
-                                    raw_input_func=mock_raw_input)
+                                    raw_input=mock_raw_input)
             self.assertEqual(expected[1], result)