Merge pull request #801 from takluyver/py3-notebook

Gets the notebook working under Python3.

IPython/frontend/html/notebook/handlers.py

@@ -172,7 +172,7 b' class ZMQStreamHandler(websocket.WebSocketHandler):'
 
 class AuthenticatedZMQStreamHandler(ZMQStreamHandler):
     def open(self, kernel_id):
-        self.kernel_id = kernel_id
+        self.kernel_id = kernel_id.decode('ascii')
         self.session = Session()
         self.save_on_message = self.on_message
         self.on_message = self.on_first_message

IPython/frontend/html/notebook/notebookmanager.py

@@ -150,7 +150,7 b' class NotebookManager(LoggingConfigurable):'
             raise web.HTTPError(415, u'Invalid notebook format: %s' % format)
 
         try:
-            nb = current.reads(data, format)
+            nb = current.reads(data.decode('utf-8'), format)
         except:
             raise web.HTTPError(400, u'Invalid JSON data')
 
@@ -171,7 +171,7 b' class NotebookManager(LoggingConfigurable):'
             raise web.HTTPError(415, u'Invalid notebook format: %s' % format)
 
         try:
-            nb = current.reads(data, format)
+            nb = current.reads(data.decode('utf-8'), format)
         except:
             raise web.HTTPError(400, u'Invalid JSON data')
 

setup3.py

@@ -1,10 +1,11 b''
 import os.path
 from setuptools import setup
 
-from setupbase import (setup_args, find_scripts, find_packages)
+from setupbase import (setup_args, find_scripts, find_packages, find_package_data)
     
 setup_args['entry_points'] = find_scripts(True, suffix='3')
 setup_args['packages'] = find_packages()
+setup_args['package_data'] = find_package_data()
 
 def main():
     setup(use_2to3 = True, **setup_args)