Merge branch 'unicode-win-process' of https://github.com/takluyver/ipython into takluyver-unicode-win-process

IPython/utils/_process_win32.py

@@ -88,9 +88,12 b' def _find_cmd(cmd):'
 
 def _system_body(p):
     """Callback for _system."""
+    enc = sys.stdin.encoding or sys.getdefaultencoding()
     for line in read_no_interrupt(p.stdout).splitlines():
+        line = line.decode(enc, 'replace')
         print(line, file=sys.stdout)
     for line in read_no_interrupt(p.stderr).splitlines():
+        line = line.decode(enc, 'replace')
         print(line, file=sys.stderr)
 
 

IPython/zmq/iostream.py

@@ -44,6 +44,10 b' class OutStream(object):'
         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,