loggerhead

Merge lp:~cjwatson/loggerhead/py3-fix-view-ui into lp:loggerhead

  1. py3-fix-view-ui
  2. Merge into trunk-rich
Proposed by Colin Watson
Status: Merged
Merged at revision: 503
Proposed branch: lp:~cjwatson/loggerhead/py3-fix-view-ui
Merge into: lp:loggerhead
Diff against target: 11 lines (+1/-0)
1 file modified
loggerhead/controllers/view_ui.py (+1/-0)
To merge this branch: bzr merge lp:~cjwatson/loggerhead/py3-fix-view-ui
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+387061@code.launchpad.net

Commit message

Fix a test failure in ViewUI.

Description of the change

text_lines needs to return text, not bytes, so we need to split file_text again after decoding it.

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loggerhead/controllers/view_ui.py'
2--- loggerhead/controllers/view_ui.py 2020-07-07 09:35:16 +0000
3+++ loggerhead/controllers/view_ui.py 2020-07-08 16:59:36 +0000
4@@ -76,6 +76,7 @@
5 breezy.textfile.check_text_lines(file_lines)
6
7 file_text = file_text.decode(encoding)
8+ file_lines = osutils.split_lines(file_text)
9
10 if highlight is not None:
11 hl_lines = highlight(file_name, file_text, encoding)

Subscribers

People subscribed via source and target branches