Commitdb64fb9

authored

gh-97825: fix AttributeError when calling subprocess.check_output(input=None) with encoding or errors args (#97826)

* fix AttributeError, add unit test

1 parent0ceafa7 commitdb64fb9Copy full SHA for db64fb9

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,8 @@ def check_output(popenargs, timeout=None, *kwargs):`
`456`	`456`	`if'input'inkwargsandkwargs['input']isNone:`
`457`	`457`	`# Explicitly passing input=None was previously equivalent to passing an`
`458`	`458`	`# empty string. That is maintained here for backwards compatibility.`
`459`		`-ifkwargs.get('universal_newlines')orkwargs.get('text'):`
	`459`	`+ifkwargs.get('universal_newlines')orkwargs.get('text')orkwargs.get('encoding') \`
	`460`	`+orkwargs.get('errors'):`
`460`	`461`	`empty=''`
`461`	`462`	`else:`
`462`	`463`	`empty=b''`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,12 @@ def test_check_output_input_none_universal_newlines(self):`
`238`	`238`	`input=None,universal_newlines=True)`
`239`	`239`	`self.assertNotIn('XX',output)`
`240`	`240`
	`241`	`+deftest_check_output_input_none_encoding_errors(self):`
	`242`	`+output=subprocess.check_output(`
	`243`	`+ [sys.executable,"-c","print('foo')"],`
	`244`	`+input=None,encoding='utf-8',errors='ignore')`
	`245`	`+self.assertIn('foo',output)`
	`246`	`+`
`241`	`247`	`deftest_check_output_stdout_arg(self):`
`242`	`248`	`# check_output() refuses to accept 'stdout' argument`
`243`	`249`	`withself.assertRaises(ValueError)asc:`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixes:exc:`AttributeError` when:meth:`subprocess.check_output` is used with argument ``input=None`` and either of the arguments encoding or errors are used.

Comments

(0)