Commit4083dd8

committed

Fix new mypy confusion about kill_after_timeout type

The refactoring in1ef3365 before this added a new mypy error onnon-Windows platforms, where mypy failed to infer that the type ofkill_after_timeout was `float` (rather than `float | None`) at thepoint in the code where it was used as a captured variable in thenewly introduced communicate() helper.This was even though the variable is never rebound there or in theenclosing scope that introduced it. So introducing and using a newvariable that holds the same reference, which is sufficient to fixthe problem and is the approach taken here, is not a behavioralchange.

1 parent1ef3365 commit4083dd8Copy full SHA for 4083dd8

File tree

1 file changed

-2

lines changed

git
- cmd.py

1 file changed

-2

lines changed

`‎git/cmd.py`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1180,6 +1180,8 @@ def execute(`
`1180`	`1180`	`returnself.AutoInterrupt(proc,command)`
`1181`	`1181`
`1182`	`1182`	`ifsys.platform!="win32"andkill_after_timeoutisnotNone:`
	`1183`	`+# Help mypy figure out this is not None even when used inside communicate().`
	`1184`	`+timeout=kill_after_timeout`
`1183`	`1185`
`1184`	`1186`	`defkill_process(pid:int)->None:`
`1185`	`1187`	`"""Callback to kill a process.`
`@@ -1216,7 +1218,7 @@ def communicate() -> Tuple[AnyStr, AnyStr]:`
`1216`	`1218`	`ifkill_check.is_set():`
`1217`	`1219`	`err='Timeout: the command "%s" did not complete in %d '"secs."% (`
`1218`	`1220`	`" ".join(redacted_command),`
`1219`		`-kill_after_timeout,`
	`1221`	`+timeout,`
`1220`	`1222`	`)`
`1221`	`1223`	`ifnotuniversal_newlines:`
`1222`	`1224`	`err=err.encode(defenc)`
`@@ -1225,7 +1227,7 @@ def communicate() -> Tuple[AnyStr, AnyStr]:`
`1225`	`1227`	`# END helpers`
`1226`	`1228`
`1227`	`1229`	`kill_check=threading.Event()`
`1228`		`-watchdog=threading.Timer(kill_after_timeout,kill_process,args=(proc.pid,))`
	`1230`	`+watchdog=threading.Timer(timeout,kill_process,args=(proc.pid,))`
`1229`	`1231`	`else:`
`1230`	`1232`	`communicate=proc.communicate`
`1231`	`1233`

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!

Commit4083dd8

File tree

1 file changed

1 file changed

`‎git/cmd.py`

0 commit comments