Py3 notebook #801

Merged
merged 3 commits into from Oct 8, 2011
@@ -172,7 +172,7 @@ def _on_zmq_reply(self, msg_list):
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
@@ -150,7 +150,7 @@ def save_new_notebook(self, data, name=None, format=u'json'):
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 @@ def save_notebook(self, notebook_id, data, name=None, format=u'json'):
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')
View
@@ -1,10 +1,11 @@
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)