Movatterモバイル変換

Skip to content

gitpython-developers/GitPythonPublic

NotificationsYou must be signed in to change notification settings
Fork940
Star4.9k

Commit9debf6b

Byron

committed

Merge pull request#405 from nvie/master

Make sure .read() and friends always return bytes

2 parentsdabd563 +5324565 commit9debf6bCopy full SHA for 9debf6b

File tree

2 files changed

+5

-5

lines changed

git
- cmd.py
- test
  - test_repo.py

2 files changed

+5

-5

lines changed

`‎git/cmd.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ def __init__(self, size, stream):`
`355`	`355`	`defread(self,size=-1):`
`356`	`356`	`bytes_left=self._size-self._nbr`
`357`	`357`	`ifbytes_left==0:`
`358`		`-return''`
	`358`	`+returnb''`
`359`	`359`	`ifsize>-1:`
`360`	`360`	`# assure we don't try to read past our limit`
`361`	`361`	`size=min(bytes_left,size)`
`@@ -374,7 +374,7 @@ def read(self, size=-1):`
`374`	`374`
`375`	`375`	`defreadline(self,size=-1):`
`376`	`376`	`ifself._nbr==self._size:`
`377`		`-return''`
	`377`	`+returnb''`
`378`	`378`
`379`	`379`	`# clamp size to lowest allowed value`
`380`	`380`	`bytes_left=self._size-self._nbr`

`‎git/test/test_repo.py`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ def mktiny():`
`454`	`454`	`asserts.readline()==l1`
`455`	`455`	`asserts.readline()==l2`
`456`	`456`	`asserts.readline()==l3`
`457`		`-asserts.readline()==''`
	`457`	`+asserts.readline()==b''`
`458`	`458`	`asserts._stream.tell()==len(d)`
`459`	`459`
`460`	`460`	`# readline limit`
`@@ -465,13 +465,13 @@ def mktiny():`
`465`	`465`	`# readline on tiny section`
`466`	`466`	`s=mktiny()`
`467`	`467`	`asserts.readline()==l1p`
`468`		`-asserts.readline()==''`
	`468`	`+asserts.readline()==b''`
`469`	`469`	`asserts._stream.tell()==ts+1`
`470`	`470`
`471`	`471`	`# read no limit`
`472`	`472`	`s=mkfull()`
`473`	`473`	`asserts.read()==d[:-1]`
`474`		`-asserts.read()==''`
	`474`	`+asserts.read()==b''`
`475`	`475`	`asserts._stream.tell()==len(d)`
`476`	`476`
`477`	`477`	`# read limit`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp