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

[Jonathan Jacobs]

Fix failing Imaginary text tests.

[Jean-Paul Calderone (exarkun)]

Hmmm. This means Imaginary will only work with trunk@HEAD?

[Jonathan Jacobs (jjacobs)]

> Hmmm. This means Imaginary will only work with trunk@HEAD?

I guess so. There could be some kind of getattr fallback shenanigans? Or alternatively the code for _currentFormattingState could also be copied to this class?

[Glyph Lefkowitz (glyph)]

On May 2, 2013, at 6:21 AM, Jonathan Jacobs <email address hidden> wrote:

>> Hmmm. This means Imaginary will only work with trunk@HEAD?
>
> I guess so. There could be some kind of getattr fallback shenanigans? Or alternatively the code for _currentFormattingState could also be copied to this class?

Sorry, I'm missing some context. trunk@HEAD of...?

[Jonathan Jacobs (jjacobs)]

>
> On May 2, 2013, at 6:21 AM, Jonathan Jacobs <email address hidden>
> wrote:
>
> >> Hmmm. This means Imaginary will only work with trunk@HEAD?
> >
> > I guess so. There could be some kind of getattr fallback shenanigans? Or
> alternatively the code for _currentFormattingState could also be copied to
> this class?
>
> Sorry, I'm missing some context. trunk@HEAD of...?

Of Twisted. Or whatever revision the conch changes are in, if you want to be specific.

[Jean-Paul Calderone (exarkun)]

The rest of the context is that a private method changed names in Twisted last week or so. Imaginary was calling that private method. The change here makes it call the private method by its new name.

[Jean-Paul Calderone (exarkun)]

The "Echo Server" example at http://twistedmatrix.com/ does just this.

[Jean-Paul Calderone (exarkun)]

Sorry, wrong form. :(

[Jean-Paul Calderone (exarkun)]

Okay Twisted 13.2 is out, so this will now change Imaginary from depending on a private implementation detail of Twisted <13.2 to depending on a private implementation detail of Twisted >=13.2 (rather than a private implementation of detail of Twisted trunk@WHOKNOWSWHAT).

I think I'm okay with that, but the branch should update the Imaginary DEPS file.

=== 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:30:36 +0000
@@ -333,7 +333,7 @@
             self._scrollDown()
         # The following conditional has been changed from the original.
         if (b > '\x7f' or b in string.printable) and b not in '\r\n':
-            ch = (b, self._currentCharacterAttributes())
+            ch = (b, self._currentFormattingState())
             if self.modes.get(insults.modes.IRM):
                 self.lines[self.y][self.x:self.x] = [ch]
                 self.lines[self.y].pop()