Ignore trailing last empty string in .split() output

nvie · nvie · commit 187fe114585b · 2016-05-24T19:27:32.000+02:00
diff --git a/git/repo/base.py b/git/repo/base.py
@@ -682,12 +682,9 @@ def blame_incremental(self, rev, file, **kwargs):
 data = self.git.blame(rev, '--', file, p=True, incremental=True, stdout_as_string=False, **kwargs)
 commits = dict()
 
- stream = iter(data.split(b'\n'))
+ stream = (line for line in data.split(b'\n') if line)
 while True:
 line = next(stream) # when exhausted, casues a StopIteration, terminating this function
- if line.strip() == '' or line.strip() == b'':
- # Skip over empty lines
- continue
 hexsha, orig_lineno, lineno, num_lines = line.split()
 lineno = int(lineno)
 num_lines = int(num_lines)

-Original file line number
+Diff line change
 data=self.git.blame(rev, '--', file, p=True, incremental=True, stdout_as_string=False, **kwargs)
 commits=dict()
 -stream=iter(data.split(b'\n'))
 +stream=(lineforlineindata.split(b'\n')ifline)
 whileTrue:
 line=next(stream) # when exhausted, casues a StopIteration, terminating this function
 -ifline.strip() ==''orline.strip() ==b'':
 -# Skip over empty lines
 -continue
 hexsha, orig_lineno, lineno, num_lines=line.split()
 lineno=int(lineno)
 num_lines=int(num_lines)