diff --git a/nyroglancer/extension.py b/nyroglancer/extension.py index 2bbda77..d4f2bb3 100644 --- a/nyroglancer/extension.py +++ b/nyroglancer/extension.py @@ -22,7 +22,7 @@ def get(self): class MainBundle(IPythonHandler): def get(self): - self.write(main_js.replace("chunk_worker.bundle.js", "js/neuroglancer/chunk_worker.bundle.js")) + self.write(main_js.replace("chunk_worker.bundle.js".encode('utf8'), "js/neuroglancer/chunk_worker.bundle.js".encode('utf8'))) self.set_header("Content-Type", "application/javascript") class ChunkWorkerBundle(IPythonHandler): diff --git a/nyroglancer/intrusion.py b/nyroglancer/intrusion.py index ac51fbd..c553097 100644 --- a/nyroglancer/intrusion.py +++ b/nyroglancer/intrusion.py @@ -1,4 +1,5 @@ from jupyter_client import BlockingKernelClient +import sys clients = {} @@ -58,7 +59,12 @@ def evaluate(kernel_client, expression): result['evalue'] + "\n\n" + "\n\t".join(result['traceback'])) - data = result['data'].values()[0].strip().strip('\'').decode('string-escape') + raw_data = result['data'].values()[0].strip().strip('\'') + # python3 + if sys.version_info[0] == 3: + data = bytes(raw_data, 'utf8').decode('unicode_escape') + else: + data = raw_data.decode('string_escape') #print "[nyroglancer] return data part (between >>> and <<<):\n\t>>>" + str(data) + "<<<\n" diff --git a/nyroglancer/viewer.py b/nyroglancer/viewer.py index 9004525..35b60a7 100644 --- a/nyroglancer/viewer.py +++ b/nyroglancer/viewer.py @@ -3,9 +3,9 @@ from tornado.escape import url_escape from tornado.httpclient import HTTPClient import collections -import intrusion +import nyroglancer.intrusion import json -import ndstore +import nyroglancer.ndstore import neuroglancer import urllib @@ -54,7 +54,7 @@ def register_volume(self, volume): cf = url_escape(find_connection_file()) http_client= HTTPClient() try: - response = http_client.fetch(self.get_server_url() + '/register_token/' + volume.token.decode('utf8') + '/' + cf) + response = http_client.fetch(self.get_server_url() + '/register_token/' + volume.token.decode('utf8') + '/'+ cf) except Exception as e: raise RuntimeError("could not register token: " + str(e)) http_client.close() diff --git a/requirements.txt b/requirements.txt index 761fa09..d52dac9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ jupyter neuroglancer>=0.0.6 +request