From 0ae4841ccf6df5734933e0acb9ea1912485adfa4 2011-03-24 22:55:51
From: Thomas Kluyver <takowl@gmail.com>
Date: 2011-03-24 22:55:51
Subject: [PATCH] Further fixes and tweaks for inputsplitter.

---

diff --git a/IPython/core/inputsplitter.py b/IPython/core/inputsplitter.py
index 07fb33e..915fd8c 100644
--- a/IPython/core/inputsplitter.py
+++ b/IPython/core/inputsplitter.py
@@ -587,8 +587,6 @@ class InputSplitter(object):
 
         If input lines are not newline-terminated, a newline is automatically
         appended."""
-        if not isinstance(lines, unicode):
-            lines = lines.decode(self.encoding)
         
         if buffer is None:
             buffer = self._buffer
@@ -600,7 +598,7 @@ class InputSplitter(object):
         setattr(self, store, self._set_source(buffer))
 
     def _set_source(self, buffer):
-        return ''.join(buffer)
+        return u''.join(buffer)
 
 
 #-----------------------------------------------------------------------------
diff --git a/IPython/core/tests/test_inputsplitter.py b/IPython/core/tests/test_inputsplitter.py
index 5b2cb9c..4cf588b 100644
--- a/IPython/core/tests/test_inputsplitter.py
+++ b/IPython/core/tests/test_inputsplitter.py
@@ -364,7 +364,7 @@ class InputSplitterTestCase(unittest.TestCase):
     def test_unicode(self):
         self.isp.push(u"Pérez")
         self.isp.push(u'\xc3\xa9')
-        self.isp.push("u'\xc3\xa9'")
+        self.isp.push(u"u'\xc3\xa9'")
 
 class InteractiveLoopTestCase(unittest.TestCase):
     """Tests for an interactive loop like a python shell.