Commit08a0fad

committed

Make sure that stderr is converted to bytes

remove stderr for a wait() that is not the GitPython wrapper.

1 parent46201b3 commit08a0fadCopy full SHA for 08a0fad

File tree

2 files changed

+14

-5

lines changed

git
- cmd.py
- util.py

2 files changed

+14

-5

lines changed

`‎git/cmd.py`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -307,19 +307,28 @@ def __del__(self):`
`307`	`307`	`def__getattr__(self,attr):`
`308`	`308`	`returngetattr(self.proc,attr)`
`309`	`309`
`310`		`-defwait(self,stderr=''):`
	`310`	`+defwait(self,stderr=b''):`
`311`	`311`	`"""Wait for the process and return its status code.`
`312`	`312`
`313`	`313`	`:param stderr: Previously read value of stderr, in case stderr is already closed.`
`314`	`314`	`:warn: may deadlock if output or error pipes are used and not handled separately.`
`315`	`315`	`:raise GitCommandError: if the return status is not 0"""`
	`316`	`+`
	`317`	`+# stderr must be a bytes object as it will`
	`318`	`+# combined with more data from the process and`
	`319`	`+# decoded by the caller`
	`320`	`+ifstderrisNone:`
	`321`	`+stderr=b''`
	`322`	`+eliftype(stderr)==unicode:`
	`323`	`+stderr=stderr.encode(defenc)`
	`324`	`+`
`316`	`325`	`status=self.proc.wait()`
`317`	`326`
`318`	`327`	`defread_all_from_possibly_closed_stream(stream):`
`319`	`328`	`try:`
`320`	`329`	`returnstderr+stream.read()`
`321`	`330`	`exceptValueError:`
`322`		`-returnstderror''`
	`331`	`+returnstderrorb''`
`323`	`332`
`324`	`333`	`ifstatus!=0:`
`325`	`334`	`errstr=read_all_from_possibly_closed_stream(self.proc.stderr)`
`@@ -678,7 +687,7 @@ def _kill_process(pid):`
`678`	`687`	`# strip trailing "\n"`
`679`	`688`	`ifstderr_value.endswith(b"\n"):`
`680`	`689`	`stderr_value=stderr_value[:-1]`
`681`		`-status=proc.wait(stderr=stderr_value)`
	`690`	`+status=proc.wait()`
`682`	`691`	`# END stdout handling`
`683`	`692`	`finally:`
`684`	`693`	`proc.stdout.close()`

`‎git/util.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -772,10 +772,10 @@ def done(self):`
`772`	`772`	`self.cv.notify_all()`
`773`	`773`	`self.cv.release()`
`774`	`774`
`775`		`-defwait(self):`
	`775`	`+defwait(self,stderr=b''):`
`776`	`776`	`self.cv.acquire()`
`777`	`777`	`whileself.count>0:`
`778`		`-self.cv.wait()`
	`778`	`+self.cv.wait(strerr=stderr)`
`779`	`779`	`self.cv.release()`
`780`	`780`
`781`	`781`

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!

Commit08a0fad

File tree

2 files changed

2 files changed

`‎git/cmd.py`

`‎git/util.py`

0 commit comments