mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-27 04:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

P3K: fix cookie parsing under Python 3.x (+ duplicate import is removed)

Browse Source
This commit is contained in:
Mikhail Korobov 2013-01-17 02:51:06 +06:00
parent eff5fa878d
commit 57cecc70c2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IPython/frontend/html/notebook/handlers.py
View File

@ -27,7 +27,6 @@ import stat
import threading
import time
import uuid
import os
from tornado.escape import url_escape
from tornado import web
@ -41,6 +40,7 @@ from IPython.zmq.session import Session
from IPython.lib.security import passwd_check
from IPython.utils.jsonutil import date_default
from IPython.utils.path import filefind
from IPython.utils.py3compat import PY3
try:
from docutils.core import publish_string
@ -434,8 +434,9 @@ class AuthenticatedZMQStreamHandler(ZMQStreamHandler):
def _inject_cookie_message(self, msg):
"""Inject the first message, which is the document cookie,
for authentication."""
if isinstance(msg, unicode):
# Cookie can't constructor doesn't accept unicode strings for some reason
if not PY3 and isinstance(msg, unicode):
# Cookie constructor doesn't accept unicode strings
# under Python 2.x for some reason
msg = msg.encode('utf8', 'replace')
try:
self.request._cookies = Cookie.SimpleCookie(msg)