Handle unicode properly in IPython.zmq.iostream

IPython/zmq/iostream.py

@@ -1,97 +1,93 b''
 import logging
 import sys
 import time
-from cStringIO import StringIO
+from io import StringIO
 
 from session import extract_header, Message
 
 from IPython.utils import io
 
 #-----------------------------------------------------------------------------
 # Globals
 #-----------------------------------------------------------------------------
 
 # Module-level logger
 logger =  logging.getLogger(__name__)
 
 #-----------------------------------------------------------------------------
 # Stream classes
 #-----------------------------------------------------------------------------
 
 class OutStream(object):
     """A file like object that publishes the stream to a 0MQ PUB socket."""
 
     # The time interval between automatic flushes, in seconds.
     flush_interval = 0.05
     topic=None
 
     def __init__(self, session, pub_socket, name):
         self.session = session
         self.pub_socket = pub_socket
         self.name = name
         self.parent_header = {}
         self._new_buffer()
 
     def set_parent(self, parent):
         self.parent_header = extract_header(parent)
 
     def close(self):
         self.pub_socket = None
 
     def flush(self):
         #io.rprint('>>>flushing output buffer: %s<<<' % self.name)  # dbg
         if self.pub_socket is None:
             raise ValueError(u'I/O operation on closed file')
         else:
             data = self._buffer.getvalue()
             if data:
-                # Make sure that we're handling unicode
-                if not isinstance(data, unicode):
-                    enc = sys.stdin.encoding or sys.getdefaultencoding()
-                    data = data.decode(enc, 'replace')
                 content = {u'name':self.name, u'data':data}
                 msg = self.session.send(self.pub_socket, u'stream', content=content,
                                        parent=self.parent_header, ident=self.topic)
                 logger.debug(msg)
 
                 self._buffer.close()
                 self._new_buffer()
 
     def isatty(self):
         return False
 
     def next(self):
         raise IOError('Read not supported on a write only stream.')
 
     def read(self, size=-1):
         raise IOError('Read not supported on a write only stream.')
 
     def readline(self, size=-1):
         raise IOError('Read not supported on a write only stream.')
 
     def write(self, string):
         if self.pub_socket is None:
             raise ValueError('I/O operation on closed file')
         else:
-            # We can only send raw bytes, not unicode objects, so we encode
-            # into utf-8 for all frontends if we get unicode inputs.
-            if type(string) == unicode:
-                string = string.encode('utf-8')
-                
+            # Make sure that we're handling unicode
+            if not isinstance(string, unicode):
+                enc = sys.stdin.encoding or sys.getdefaultencoding()
+                string = string.decode(enc, 'replace')
+            
             self._buffer.write(string)
             current_time = time.time()
             if self._start <= 0:
                 self._start = current_time
             elif current_time - self._start > self.flush_interval:
                 self.flush()
 
     def writelines(self, sequence):
         if self.pub_socket is None:
             raise ValueError('I/O operation on closed file')
         else:
             for string in sequence:
                 self.write(string)
 
     def _new_buffer(self):
         self._buffer = StringIO()
         self._start = -1