Commit84bf2ca

committed

Read USE_SHELL in Git.execute without DeprecationWarning

This changes how Git.execute itself accesses the USE_SHELLattribute, so that its own read of it does not issue a warning.

1 parentc5d5b16 commit84bf2caCopy full SHA for 84bf2ca

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1189,7 +1189,12 @@ def execute(`
`1189`	`1189`
`1190`	`1190`	`stdout_sink=PIPEifwith_stdoutelsegetattr(subprocess,"DEVNULL",None)oropen(os.devnull,"wb")`
`1191`	`1191`	`ifshellisNone:`
`1192`		`-shell=self.USE_SHELL`
	`1192`	`+# Get the value of USE_SHELL with no deprecation warning. Do this without`
	`1193`	`+# warnings.catch_warnings, to avoid a race condition with application code`
	`1194`	`+# configuring warnings. The value could be looked up in type(self).__dict__`
	`1195`	`+# or Git.__dict__, but those can break under some circumstances. This works`
	`1196`	`+# the same as self.USE_SHELL in more situations; see Git.__getattribute__.`
	`1197`	`+shell=super().__getattribute__("USE_SHELL")`
`1193`	`1198`	`_logger.debug(`
`1194`	`1199`	`"Popen(%s, cwd=%s, stdin=%s, shell=%s, universal_newlines=%s)",`
`1195`	`1200`	`redacted_command,`

Comments

(0)