Commit4ba3e5b

committed

handle asynchronous exceptions when creating SubprocessTransport

1 parentd808954 commit4ba3e5bCopy full SHA for 4ba3e5b

File tree

2 files changed

+13

-16

lines changed

asyncio
- base_subprocess.py
- unix_events.py

2 files changed

+13

-16

lines changed

`‎asyncio/base_subprocess.py`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ def __init__(self, loop, protocol, args, shell,`
`26`	`26`	`self._pending_calls=collections.deque()`
`27`	`27`	`self._pipes= {}`
`28`	`28`	`self._finished=False`
	`29`	`+self._failed_before_start=False`
`29`	`30`
`30`	`31`	`ifstdin==subprocess.PIPE:`
`31`	`32`	`self._pipes[0]=None`
`@@ -47,7 +48,12 @@ def _create_child(self, waiter, args, shell, stdin, stdout, stderr,`
`47`	`48`	`start=self._start(args=args,shell=shell,stdin=stdin,`
`48`	`49`	`stdout=stdout,stderr=stderr,`
`49`	`50`	`bufsize=bufsize,**start_kwargs)`
	`51`	`+except:`
	`52`	`+self._failed_before_start=True`
	`53`	`+self.close()`
	`54`	`+raise`
`50`	`55`
	`56`	`+try:`
`51`	`57`	`ifstartisnotNone:`
`52`	`58`	`# _start is not required to be a coroutine`
`53`	`59`	`yieldfromstart`
`@@ -255,6 +261,12 @@ def _wait(self):`
`255`	`261`	`"""Wait until the process exit and return the process return code.`
`256`	`262`
`257`	`263`	`This method is a coroutine."""`
	`264`	`+ifself._failed_before_start:`
	`265`	`+# Let loop._make_subprocess_transport() call transport._wait() when`
	`266`	`+# an exception is raised asynchronously during the setup of the`
	`267`	`+# transport, it garantees that necessary cleanup will be performed.`
	`268`	`+return`
	`269`	`+`
`258`	`270`	`ifself._returncodeisnotNone:`
`259`	`271`	`returnself._returncode`
`260`	`272`

`‎asyncio/unix_events.py`

Lines changed: 1 addition & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -713,10 +713,6 @@ def _check_exec_result(self, pid, returncode, orig_executable, cwd,`
`713`	`713`
`714`	`714`
`715`	`715`	`class_UnixSubprocessTransport(base_subprocess.BaseSubprocessTransport):`
`716`		`-def__init__(self,args,*kwargs):`
`717`		`-super().__init__(args,*kwargs)`
`718`		`-self._failed_before_exec=False`
`719`		`-`
`720`	`716`	`@coroutine`
`721`	`717`	`def_start(self,args,shell,stdin,stdout,stderr,bufsize,**kwargs):`
`722`	`718`	`withevents.get_child_watcher()aswatcher:`
`@@ -742,7 +738,7 @@ def _start(self, args, shell, stdin, stdout, stderr, bufsize, **kwargs):`
`742`	`738`	`universal_newlines=False,bufsize=bufsize,**kwargs)`
`743`	`739`	`yieldfromexec_waiter`
`744`	`740`	`except:`
`745`		`-self._failed_before_exec=True`
	`741`	`+self._failed_before_start=True`
`746`	`742`	`# TODO stdin is probably closed by proc, but what about stdin_w`
`747`	`743`	`# so far? check this`
`748`	`744`	`ifstdin_wisnotNone:`
`@@ -758,17 +754,6 @@ def _start(self, args, shell, stdin, stdout, stderr, bufsize, **kwargs):`
`758`	`754`	`def_child_watcher_callback(self,pid,returncode):`
`759`	`755`	`self._loop.call_soon_threadsafe(self._process_exited,returncode)`
`760`	`756`
`761`		`-@coroutine`
`762`		`-def_wait(self):`
`763`		`-ifself._failed_before_exec:`
`764`		`-# let loop._make_subprocess_transport() call transport._wait() when`
`765`		`-# an excpetion is raised asynchronously during the setup of the`
`766`		`-# transport, which garantees that necessary cleanup will be`
`767`		`-# performed`
`768`		`-return`
`769`		`-else:`
`770`		`-return (yieldfromsuper()._wait())`
`771`		`-`
`772`	`757`
`773`	`758`	`classAbstractChildWatcher:`
`774`	`759`	`"""Abstract base class for monitoring child processes.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit4ba3e5b

File tree

2 files changed

2 files changed

`‎asyncio/base_subprocess.py`

`‎asyncio/unix_events.py`

0 commit comments