Merge "Fix change view display of inline comments in python3"

This commit is contained in:
Zuul 2019-03-28 15:05:26 +00:00 committed by Gerrit Code Review
commit 8c78bdc1ef
1 changed files with 3 additions and 3 deletions

View File

@ -455,7 +455,7 @@ class ChangeMessageBox(mywid.HyperText):
for comment in comments: for comment in comments:
path = comment.file.path path = comment.file.path
inline_comments.setdefault(path, []) inline_comments.setdefault(path, [])
inline_comments[path].append((comment.line, comment.message)) inline_comments[path].append((comment.line or 0, comment.message))
for v in inline_comments.values(): for v in inline_comments.values():
v.sort() v.sort()
@ -464,8 +464,8 @@ class ChangeMessageBox(mywid.HyperText):
for key, value in inline_comments.items(): for key, value in inline_comments.items():
comment_text.append(('filename-inline-comment', u'%s' % key)) comment_text.append(('filename-inline-comment', u'%s' % key))
for line, comment in value: for line, comment in value:
if line is None: if not line:
comment_text.append(u'\n %s' % comment) comment_text.append(u'\n %s\n' % comment)
else: else:
comment_text.append(u'\n %s: %s\n' % (line, comment)) comment_text.append(u'\n %s: %s\n' % (line, comment))