Commitc49ba43

authored and

committed

The proper way is return, not raise StopIteration

1 parent8fc6563 commitc49ba43Copy full SHA for c49ba43

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,7 @@ def iter_items(cls, repo, parent_commit='HEAD'):`
`1160`	`1160`	`try:`
`1161`	`1161`	`parser=cls._config_parser(repo,pc,read_only=True)`
`1162`	`1162`	`exceptIOError:`
`1163`		`-raiseStopIteration`
	`1163`	`+return`
`1164`	`1164`	`# END handle empty iterator`
`1165`	`1165`
`1166`	`1166`	`rt=pc.tree# root tree`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,10 @@ def blame_incremental(self, rev, file, **kwargs):`
`714`	`714`
`715`	`715`	`stream= (lineforlineindata.split(b'\n')ifline)`
`716`	`716`	`whileTrue:`
`717`		`-line=next(stream)# when exhausted, causes a StopIteration, terminating this function`
	`717`	`+try:`
	`718`	`+line=next(stream)# when exhausted, causes a StopIteration, terminating this function`
	`719`	`+exceptStopIteration:`
	`720`	`+return`
`718`	`721`	`hexsha,orig_lineno,lineno,num_lines=line.split()`
`719`	`722`	`lineno=int(lineno)`
`720`	`723`	`num_lines=int(num_lines)`
`@@ -724,7 +727,10 @@ def blame_incremental(self, rev, file, **kwargs):`
`724`	`727`	`# for this commit`
`725`	`728`	`props= {}`
`726`	`729`	`whileTrue:`
`727`		`-line=next(stream)`
	`730`	`+try:`
	`731`	`+line=next(stream)`
	`732`	`+exceptStopIteration:`
	`733`	`+return`
`728`	`734`	`ifline==b'boundary':`
`729`	`735`	`# "boundary" indicates a root commit and occurs`
`730`	`736`	`# instead of the "previous" tag`
`@@ -749,7 +755,10 @@ def blame_incremental(self, rev, file, **kwargs):`
`749`	`755`	`# Discard all lines until we find "filename" which is`
`750`	`756`	`# guaranteed to be the last line`
`751`	`757`	`whileTrue:`
`752`		`-line=next(stream)# will fail if we reach the EOF unexpectedly`
	`758`	`+try:`
	`759`	`+line=next(stream)# will fail if we reach the EOF unexpectedly`
	`760`	`+exceptStopIteration:`
	`761`	`+return`
`753`	`762`	`tag,value=line.split(b' ',1)`
`754`	`763`	`iftag==b'filename':`
`755`	`764`	`orig_filename=value`

Comments

(0)