Commitf122a6a

committed

Return bytes if object name can't be utf8-decoded

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>

1 parentdb82455 commitf122a6aCopy full SHA for f122a6a

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,13 @@ def tree_entries_from_data(data):`
`70`	`70`	`# default encoding for strings in git is utf8`
`71`	`71`	`# Only use the respective unicode object if the byte stream was encoded`
`72`	`72`	`name=data[ns:i]`
`73`		`-name_enc=name.decode("utf-8")`
`74`		`-iflen(name)>len(name_enc):`
`75`		`-name=name_enc`
	`73`	`+try:`
	`74`	`+name_enc=name.decode("utf-8")`
	`75`	`+exceptUnicodeDecodeError:`
	`76`	`+pass`
	`77`	`+else:`
	`78`	`+iflen(name)>len(name_enc):`
	`79`	`+name=name_enc`
`76`	`80`	`# END handle encoding`
`77`	`81`
`78`	`82`	`# byte is NULL, get next 20`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -249,3 +249,8 @@ def test_tree_traversal_single(self):`
`249`	`249`	`entries=traverse_tree_recursive(odb,commit.tree.binsha,'')`
`250`	`250`	`assertentries`
`251`	`251`	`# END for each commit`
	`252`	`+`
	`253`	`+deftest_tree_entries_from_data():`
	`254`	`+fromgit.objects.funimporttree_entries_from_data`
	`255`	`+r=tree_entries_from_data(b'100644\x9f\0aaa')`
	`256`	`+assertr== [('aaa',33188,'\x9f')],r`

Comments

(0)

ページ先頭