PR#4190: Decode the output from the shell commands if they are not already unicode - pagure

pagure

#4190 Decode the output from the shell commands if they are not already unicode

Merged 5 years ago by pingou. Opened 5 years ago by pingou.

fix_hook_py2 into master

Decode the output from the shell commands if they are not already unicode

Pierre-Yves Chibon • 5 years ago

6e566ad

pagure/lib/git.py

file modified

+3 -3

		`@@ -1215,16 +1215,16 @@`
		`)`
		`retcode = procs.wait()`
		`(out, err) = procs.communicate(input)`
		`- if not isinstance(out, str):`
		`+ if isinstance(out, six.binary_type):`
		`out = out.decode("utf-8")`
		`- if not isinstance(err, str):`
		`+ if isinstance(err, six.binary_type):`
		`err = err.decode("utf-8")`
		`if retcode:`
		`print("ERROR: %s =-- %s" % (cmd, retcode))`
		`print(out)`
		`print(err)`
		`if not keepends:`
		`- out = out.rstrip("\n\r")`
		`+ out = out.rstrip(u"\n\r")`

		`if error:`
		`return (out, err)`

pingou commented 5 years ago

Signed-off-by: Pierre-Yves Chibon pingou@pingoured.fr

rebased onto 909539656aa557bdba30822a2d2a9e77fa715166

5 years ago

rebased onto 1138f8d34d53594411ec58240c777699d4af9ebe

5 years ago

hberaud commented 5 years ago

I guess you need to change your commit message to also specify the changes related to six check and binary type who introduce better compatibility with python 2 and 3.

rebased onto 6e566ad

5 years ago