##// END OF EJS Templates
Further fixes and tweaks for inputsplitter.
Thomas Kluyver -
Show More
@@ -587,8 +587,6 b' class InputSplitter(object):'
587
587
588 If input lines are not newline-terminated, a newline is automatically
588 If input lines are not newline-terminated, a newline is automatically
589 appended."""
589 appended."""
590 if not isinstance(lines, unicode):
591 lines = lines.decode(self.encoding)
592
590
593 if buffer is None:
591 if buffer is None:
594 buffer = self._buffer
592 buffer = self._buffer
@@ -600,7 +598,7 b' class InputSplitter(object):'
600 setattr(self, store, self._set_source(buffer))
598 setattr(self, store, self._set_source(buffer))
601
599
602 def _set_source(self, buffer):
600 def _set_source(self, buffer):
603 return ''.join(buffer)
601 return u''.join(buffer)
604
602
605
603
606 #-----------------------------------------------------------------------------
604 #-----------------------------------------------------------------------------
@@ -364,7 +364,7 b' class InputSplitterTestCase(unittest.TestCase):'
364 def test_unicode(self):
364 def test_unicode(self):
365 self.isp.push(u"Pérez")
365 self.isp.push(u"Pérez")
366 self.isp.push(u'\xc3\xa9')
366 self.isp.push(u'\xc3\xa9')
367 self.isp.push("u'\xc3\xa9'")
367 self.isp.push(u"u'\xc3\xa9'")
368
368
369 class InteractiveLoopTestCase(unittest.TestCase):
369 class InteractiveLoopTestCase(unittest.TestCase):
370 """Tests for an interactive loop like a python shell.
370 """Tests for an interactive loop like a python shell.
General Comments 0
You need to be logged in to leave comments. Login now