Revert of Fix pylint warnings in webkitpy/common/.

third_party/WebKit/Tools/Scripts/webkitpy/common/system/user.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 37 matching lines @@
     DEFAULT_NO = 'n'
     DEFAULT_YES = 'y'
 
     def __init__(self, platforminfo=None):
         # We cannot get the PlatformInfo object from a SystemHost because
         # User is part of SystemHost itself.
         self._platforminfo = platforminfo or PlatformInfo(sys, platform, FileSystem(), Executive())
 
     # FIXME: These are @classmethods because bugzilla.py doesn't have a Tool object (thus no User instance).
     @classmethod
-    def prompt(cls, message, repeat=1, raw_input_func=raw_input):
+    def prompt(cls, message, repeat=1, raw_input=raw_input):
         response = None
         while repeat and not response:
             repeat -= 1
-            response = raw_input_func(message)
+            response = raw_input(message)
         return response
 
     @classmethod
     def prompt_password(cls, message, repeat=1):
-        return cls.prompt(message, repeat=repeat, raw_input_func=getpass.getpass)
+        return cls.prompt(message, repeat=repeat, raw_input=getpass.getpass)
 
     @classmethod
-    def prompt_with_multiple_lists(cls, list_title, subtitles, lists, can_choose_multiple=False, raw_input_func=raw_input):
+    def prompt_with_multiple_lists(cls, list_title, subtitles, lists, can_choose_multiple=False, raw_input=raw_input):
         item_index = 0
         cumulated_list = []
         print list_title
         for i in range(len(subtitles)):
             print "\n" + subtitles[i]
             for item in lists[i]:
                 item_index += 1
                 print "%2d. %s" % (item_index, item)
             cumulated_list += lists[i]
-        return cls._wait_on_list_response(cumulated_list, can_choose_multiple, raw_input_func)
+        return cls._wait_on_list_response(cumulated_list, can_choose_multiple, raw_input)
 
     @classmethod
-    def _wait_on_list_response(cls, list_items, can_choose_multiple, raw_input_func):
+    def _wait_on_list_response(cls, list_items, can_choose_multiple, raw_input):
         while True:
             if can_choose_multiple:
                 response = cls.prompt(
-                    "Enter one or more numbers (comma-separated) or ranges (e.g. 3-7), or \"all\": ", raw_input_func=raw_input_func)
+                    "Enter one or more numbers (comma-separated) or ranges (e.g. 3-7), or \"all\": ", raw_input=raw_input)
                 if not response.strip() or response == "all":
                     return list_items
 
                 try:
                     indices = []
-                    for value in re.split(r"\s*,\s*", response):
+                    for value in re.split("\s*,\s*", response):
                         parts = value.split('-')
                         if len(parts) == 2:
                             indices += range(int(parts[0]) - 1, int(parts[1]))
                         else:
                             indices.append(int(value) - 1)
                 except ValueError:
                     continue
 
                 return [list_items[i] for i in indices]
             else:
                 try:
-                    result = int(cls.prompt("Enter a number: ", raw_input_func=raw_input_func)) - 1
+                    result = int(cls.prompt("Enter a number: ", raw_input=raw_input)) - 1
                 except ValueError:
                     continue
                 return list_items[result]
 
     @classmethod
-    def prompt_with_list(cls, list_title, list_items, can_choose_multiple=False, raw_input_func=raw_input):
+    def prompt_with_list(cls, list_title, list_items, can_choose_multiple=False, raw_input=raw_input):
         print list_title
         i = 0
         for item in list_items:
             i += 1
             print "%2d. %s" % (i, item)
-        return cls._wait_on_list_response(list_items, can_choose_multiple, raw_input_func)
+        return cls._wait_on_list_response(list_items, can_choose_multiple, raw_input)
 
     def edit(self, files):
         editor = os.environ.get("EDITOR") or "vi"
         args = shlex.split(editor)
         # Note: Not thread safe: http://bugs.python.org/issue2320
         subprocess.call(args + files)
 
     def page(self, message):
         pager = os.environ.get("PAGER") or "less"
         try:
             # Note: Not thread safe: http://bugs.python.org/issue2320
             child_process = subprocess.Popen([pager], stdin=subprocess.PIPE)
             child_process.communicate(input=message)
         except IOError:
             pass
 
-    def confirm(self, message=None, default=DEFAULT_YES, raw_input_func=raw_input):
+    def confirm(self, message=None, default=DEFAULT_YES, raw_input=raw_input):
         if not message:
             message = "Continue?"
         choice = {'y': 'Y/n', 'n': 'y/N'}[default]
-        response = raw_input_func("%s [%s]: " % (message, choice))
+        response = raw_input("%s [%s]: " % (message, choice))
         if not response:
             response = default
         return response.lower() == 'y'
 
     def can_open_url(self):
         try:
             webbrowser.get()
             return True
         except webbrowser.Error:
             return False
 
     def open_url(self, url):
         if not self.can_open_url():
             _log.warning("Failed to open %s", url)
         webbrowser.open(url)