Merge lp:~divmod-dev/divmod.org/1175494-failing-imaginary-text-tests into lp:divmod.org

Proposed by Jonathan Jacobs
Status: Merged
Merged at revision: 2707
Proposed branch: lp:~divmod-dev/divmod.org/1175494-failing-imaginary-text-tests
Merge into: lp:divmod.org
Diff against target: 12 lines (+1/-1)
1 file modified
Imaginary/imaginary/test/test_text.py (+1/-1)
To merge this branch: bzr merge lp:~divmod-dev/divmod.org/1175494-failing-imaginary-text-tests
Reviewer Review Type Date Requested Status
Divmod-dev Pending
Review via email: mp+162047@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Imaginary/imaginary/test/test_text.py'
--- Imaginary/imaginary/test/test_text.py 2010-07-16 16:39:06 +0000
+++ Imaginary/imaginary/test/test_text.py 2013-05-02 08:25:32 +0000
@@ -333,7 +333,7 @@
333 self._scrollDown()333 self._scrollDown()
334 # The following conditional has been changed from the original.334 # The following conditional has been changed from the original.
335 if (b > '\x7f' or b in string.printable) and b not in '\r\n':335 if (b > '\x7f' or b in string.printable) and b not in '\r\n':
336 ch = (b, self._currentCharacterAttributes())336 ch = (b, self._currentFormattingState())
337 if self.modes.get(insults.modes.IRM):337 if self.modes.get(insults.modes.IRM):
338 self.lines[self.y][self.x:self.x] = [ch]338 self.lines[self.y][self.x:self.x] = [ch]
339 self.lines[self.y].pop()339 self.lines[self.y].pop()

Subscribers

People subscribed via source and target branches

to all changes: