mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3624 from minrk/argunicode

Browse Source 
fix some unicode in zmqhandlers

Prevented session identity from being set properly, which in turn prevented stdin from working in the notebook in Python 3.

closes #3494
This commit is contained in:
Min RK 2013-07-14 11:19:57 -07:00
commit f3fa5cd181
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IPython/html/base/zmqhandlers.py
View File

@ -25,7 +25,7 @@ from zmq.utils import jsonapi
from IPython.kernel.zmq.session import Session from IPython.kernel.zmq.session import Session
from IPython.utils.jsonutil import date_default from IPython.utils.jsonutil import date_default
from IPython.utils.py3compat import PY3 from IPython.utils.py3compat import PY3, cast_unicode
from .handlers import IPythonHandler from .handlers import IPythonHandler
@ -83,7 +83,7 @@ class ZMQStreamHandler(websocket.WebSocketHandler):
class AuthenticatedZMQStreamHandler(ZMQStreamHandler, IPythonHandler): class AuthenticatedZMQStreamHandler(ZMQStreamHandler, IPythonHandler):
def open(self, kernel_id): def open(self, kernel_id):
self.kernel_id = kernel_id.decode('ascii') self.kernel_id = cast_unicode(kernel_id, 'ascii')
self.session = Session(config=self.config) self.session = Session(config=self.config)
self.save_on_message = self.on_message self.save_on_message = self.on_message
self.on_message = self.on_first_message self.on_message = self.on_first_message
@ -97,7 +97,7 @@ class AuthenticatedZMQStreamHandler(ZMQStreamHandler, IPythonHandler):
msg = msg.encode('utf8', 'replace') msg = msg.encode('utf8', 'replace')
try: try:
identity, msg = msg.split(':', 1) identity, msg = msg.split(':', 1)
self.session.session = identity.decode('ascii') self.session.session = cast_unicode(identity, 'ascii')
except Exception: except Exception:
logging.error("First ws message didn't have the form 'identity:[cookie]' - %r", msg) logging.error("First ws message didn't have the form 'identity:[cookie]' - %r", msg)