diff options
| author | Mike Frysinger <vapier@google.com> | 2021-02-01 19:49:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-01 19:49:15 +0000 |
| commit | 018d98a5af5d78dc4e0b4ba412bae41afb6c99a2 (patch) | |
| tree | 3a4f946762b2bda381ac50b7e6cedd5b0efaf95a | |
| parent | 9f4d922b3a32b3407e36cbd87ebc0a723d27e1b1 (diff) | |
| parent | d57f9c5ac97994a9345b636f7144eba6b223cf3d (diff) | |
| download | repohooks-018d98a5af5d78dc4e0b4ba412bae41afb6c99a2.tar.gz | |
utils: drop Python 2 support am: d57f9c5ac9
Original change: https://android-review.googlesource.com/c/platform/tools/repohooks/+/1566818
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66906372a09f619036ebc74bae6b67fc338080e8
| -rw-r--r-- | rh/utils.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/rh/utils.py b/rh/utils.py index 1b36c7a..52a6828 100644 --- a/rh/utils.py +++ b/rh/utils.py @@ -183,12 +183,8 @@ def _kill_child_process(proc, int_timeout, kill_timeout, cmd, original_handler, print('Ignoring unhandled exception in _kill_child_process: %s' % e, file=sys.stderr) - # Ensure our child process has been reaped. - kwargs = {} - if sys.version_info.major >= 3: - # ... but don't wait forever. - kwargs['timeout'] = 60 - proc.wait_lock_breaker(**kwargs) + # Ensure our child process has been reaped, but don't wait forever. + proc.wait_lock_breaker(timeout=60) if not rh.signals.relay_signal(original_handler, signum, frame): # Mock up our own, matching exit code for signaling. @@ -310,13 +306,8 @@ def run(cmd, redirect_stdout=False, redirect_stderr=False, cwd=None, input=None, kill_timeout = float(kill_timeout) def _get_tempfile(): - kwargs = {} - if sys.version_info.major < 3: - kwargs['bufsize'] = 0 - else: - kwargs['buffering'] = 0 try: - return tempfile.TemporaryFile(**kwargs) + return tempfile.TemporaryFile(buffering=0) except EnvironmentError as e: if e.errno != errno.ENOENT: raise @@ -325,7 +316,7 @@ def run(cmd, redirect_stdout=False, redirect_stderr=False, cwd=None, input=None, # issue in this particular case since our usage gurantees deletion, # and since this is primarily triggered during hard cgroups # shutdown. - return tempfile.TemporaryFile(dir='/tmp', **kwargs) + return tempfile.TemporaryFile(dir='/tmp', buffering=0) # Modify defaults based on parameters. # Note that tempfiles must be unbuffered else attempts to read |