From 5d9d04235101eb460d7178eaf3eeff1210e4954b Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Tue, 9 May 2017 14:15:57 -0400
Subject: [PATCH 01/10] trial fix to type problems

---
 nyroglancer/viewer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nyroglancer/viewer.py b/nyroglancer/viewer.py
index 9004525..c61fb85 100644
--- a/nyroglancer/viewer.py
+++ b/nyroglancer/viewer.py
@@ -54,11 +54,11 @@ 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/'.encode('utf8') + volume.token + '/'.encode('utf8') + cf)
         except Exception as e:
             raise RuntimeError("could not register token: " + str(e))
         http_client.close()
 
     def get_server_url(self):
 
-        return 'http://' + self.hostname
+        return ('http://' + self.hostname).encode('utf8')

From 05523af14b85c498c073fab2ace6a9169bda98cd Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Tue, 9 May 2017 14:19:04 -0400
Subject: [PATCH 02/10] encode all strings to utf8

---
 nyroglancer/extension.py | 6 +++---
 nyroglancer/viewer.py    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nyroglancer/extension.py b/nyroglancer/extension.py
index 2bbda77..8abd1da 100644
--- a/nyroglancer/extension.py
+++ b/nyroglancer/extension.py
@@ -22,17 +22,17 @@ 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", "js/neuroglancer/chunk_worker.bundle.js").encode('utf8'))
         self.set_header("Content-Type", "application/javascript")
 
 class ChunkWorkerBundle(IPythonHandler):
     def get(self):
-        self.write(chunk_worker_js)
+        self.write(chunk_worker_js.encode('utf8'))
         self.set_header("Content-Type", "application/javascript")
 
 class StylesCss(IPythonHandler):
     def get(self):
-        self.write(styles_css)
+        self.write(styles_css.encode('utf8'))
         self.set_header("Content-Type", "text/css")
 
 def load_jupyter_server_extension(nb_server_app):
diff --git a/nyroglancer/viewer.py b/nyroglancer/viewer.py
index c61fb85..3216372 100644
--- a/nyroglancer/viewer.py
+++ b/nyroglancer/viewer.py
@@ -39,7 +39,7 @@ def show(self):
         """Show the viewer.
         """
 
-        viewer_url = self.get_server_url() + '/neuroglancer' + '#!' + self.get_encoded_state()
+        viewer_url = self.get_server_url() + ('/neuroglancer' + '#!').encode('utf8') + self.get_encoded_state()
         large_html = "<style>.container { width:100% !important; }</style>" if self.large else ""
 
         return HTML(large_html + "<iframe src=\"" + viewer_url + "\" width=\"100%\" height=\"1024px\"><\iframe>")

From 9856841066c6b721fcd85e35b71ac5e7d5c4c999 Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Tue, 9 May 2017 14:25:44 -0400
Subject: [PATCH 03/10] request should be a string

---
 nyroglancer/viewer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nyroglancer/viewer.py b/nyroglancer/viewer.py
index 3216372..a991044 100644
--- a/nyroglancer/viewer.py
+++ b/nyroglancer/viewer.py
@@ -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/'.encode('utf8') + volume.token + '/'.encode('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()

From 1a05f8c1c4321e80550e99669b0ee9975c047f9a Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Tue, 9 May 2017 14:27:01 -0400
Subject: [PATCH 04/10] trial fix...

---
 nyroglancer/viewer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nyroglancer/viewer.py b/nyroglancer/viewer.py
index a991044..1ae0f1b 100644
--- a/nyroglancer/viewer.py
+++ b/nyroglancer/viewer.py
@@ -39,7 +39,7 @@ def show(self):
         """Show the viewer.
         """
 
-        viewer_url = self.get_server_url() + ('/neuroglancer' + '#!').encode('utf8') + self.get_encoded_state()
+        viewer_url = self.get_server_url() + '/neuroglancer' + '#!' + self.get_encoded_state()
         large_html = "<style>.container { width:100% !important; }</style>" if self.large else ""
 
         return HTML(large_html + "<iframe src=\"" + viewer_url + "\" width=\"100%\" height=\"1024px\"><\iframe>")
@@ -61,4 +61,4 @@ def register_volume(self, volume):
 
     def get_server_url(self):
 
-        return ('http://' + self.hostname).encode('utf8')
+        return 'http://' + self.hostname

From f42f16014407ca365101ee69b1348ca2c8bf94ed Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Tue, 9 May 2017 14:56:33 -0400
Subject: [PATCH 05/10] trial fix to more encoding woes

---
 nyroglancer/extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nyroglancer/extension.py b/nyroglancer/extension.py
index 8abd1da..e64fb73 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").encode('utf8'))
+        self.write(main_js.replace("chunk_worker.bundle.js".encode('utf8'), "js/neuroglancer/chunk_worker.bundle.js".encode('utf8')).encode('utf8'))
         self.set_header("Content-Type", "application/javascript")
 
 class ChunkWorkerBundle(IPythonHandler):

From ed6996f54f62f6b8820ede49fe0551e6ef85b877 Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Tue, 9 May 2017 15:03:56 -0400
Subject: [PATCH 06/10] output of main_js.replace is already a byte string

---
 nyroglancer/extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nyroglancer/extension.py b/nyroglancer/extension.py
index e64fb73..1850c1e 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".encode('utf8'), "js/neuroglancer/chunk_worker.bundle.js".encode('utf8')).encode('utf8'))
+        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):

From 63fd047c466d435434b89eed956f67f988851e3e Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Tue, 9 May 2017 15:21:22 -0400
Subject: [PATCH 07/10] remove superfluous encoding. already byte strings

---
 nyroglancer/extension.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nyroglancer/extension.py b/nyroglancer/extension.py
index 1850c1e..d4f2bb3 100644
--- a/nyroglancer/extension.py
+++ b/nyroglancer/extension.py
@@ -27,12 +27,12 @@ def get(self):
 
 class ChunkWorkerBundle(IPythonHandler):
     def get(self):
-        self.write(chunk_worker_js.encode('utf8'))
+        self.write(chunk_worker_js)
         self.set_header("Content-Type", "application/javascript")
 
 class StylesCss(IPythonHandler):
     def get(self):
-        self.write(styles_css.encode('utf8'))
+        self.write(styles_css)
         self.set_header("Content-Type", "text/css")
 
 def load_jupyter_server_extension(nb_server_app):

From d970573cbc6fd27931b67cd54cb1beb1a0e48ba7 Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Wed, 10 May 2017 11:58:02 -0400
Subject: [PATCH 08/10] updated requirements.txt

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

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

From af2c85a4c53087d8ff7fc1b35d19c78099f2b539 Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Wed, 10 May 2017 12:00:18 -0400
Subject: [PATCH 09/10] import error trial fix

---
 nyroglancer/viewer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nyroglancer/viewer.py b/nyroglancer/viewer.py
index 1ae0f1b..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
 

From ec8a723ae6dcbada701a23a6e4edcfb4602e2e04 Mon Sep 17 00:00:00 2001
From: Andrew Berger <andberger@berkeley.edu>
Date: Wed, 10 May 2017 12:27:21 -0400
Subject: [PATCH 10/10] handle string escape for 2.7 and 3.5

---
 nyroglancer/intrusion.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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"