Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1227)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive.py

Issue 2248653002: Revert of Fix pylint warnings in webkitpy/common/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manual Revert (Patch Set 1 causes patch failure in read_checksum_from_png_unittest.py) Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive.py
index 8755845ca4f0909af657ea785073a2b018d609d9..eb63764b530cdf3d819d3a817b26b7bcd2b62c15 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive.py
@@ -37,6 +37,7 @@ import subprocess
import sys
import time
+from webkitpy.common.system.outputtee import Tee
from webkitpy.common.system.filesystem import FileSystem
@@ -167,7 +168,6 @@ class Executive(object):
# we import it here instead. See https://bugs.webkit.org/show_bug.cgi?id=91682
import ctypes
- # pylint: disable=invalid-name
class PROCESSENTRY32(ctypes.Structure):
_fields_ = [("dwSize", ctypes.c_ulong),
("cntUsage", ctypes.c_ulong),
@@ -187,7 +187,7 @@ class Executive(object):
TH32CS_SNAPPROCESS = 0x00000002 # win32 magic number
hProcessSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)
pe32 = PROCESSENTRY32()
- pe32.dwSize = ctypes.sizeof(PROCESSENTRY32) # pylint: disable=attribute-defined-outside-init
+ pe32.dwSize = ctypes.sizeof(PROCESSENTRY32)
result = False
if not Process32First(hProcessSnap, ctypes.byref(pe32)):
_log.debug("Failed getting first process.")
@@ -311,24 +311,24 @@ class Executive(object):
def ignore_error(error):
pass
- def _compute_stdin(self, input_obj):
+ def _compute_stdin(self, input):
"""Returns (stdin, string_to_communicate)"""
# FIXME: We should be returning /dev/null for stdin
# or closing stdin after process creation to prevent
# child processes from getting input from the user.
- if not input_obj:
+ if not input:
return (None, None)
- if hasattr(input_obj, "read"): # Check if the input_obj is a file.
- return (input_obj, None) # Assume the file is in the right encoding.
+ if hasattr(input, "read"): # Check if the input is a file.
+ return (input, None) # Assume the file is in the right encoding.
# Popen in Python 2.5 and before does not automatically encode unicode objects.
# http://bugs.python.org/issue5290
# See https://bugs.webkit.org/show_bug.cgi?id=37528
# for an example of a regression caused by passing a unicode string directly.
# FIXME: We may need to encode differently on different platforms.
- if isinstance(input_obj, unicode):
- input_obj = input_obj.encode(self._child_process_encoding())
- return (self.PIPE, input_obj)
+ if isinstance(input, unicode):
+ input = input.encode(self._child_process_encoding())
+ return (self.PIPE, input)
def command_for_printing(self, args):
"""Returns a print-ready string representing command args.
@@ -347,7 +347,7 @@ class Executive(object):
args,
cwd=None,
env=None,
- input_func=None,
+ input=None,
error_handler=None,
return_exit_code=False,
return_stderr=True,
@@ -356,7 +356,7 @@ class Executive(object):
assert isinstance(args, list) or isinstance(args, tuple)
start_time = time.time()
- stdin, string_to_communicate = self._compute_stdin(input_func)
+ stdin, string_to_communicate = self._compute_stdin(input)
stderr = self.STDOUT if return_stderr else None
process = self.popen(args,

Powered by Google App Engine
This is Rietveld 408576698