Merge pull request #313 from afshin/terminal-editor

Remove editor and terminal handlers from server

Author: afshin

jupyter_server/edit/__init__.py

@@ -119,7 +119,6 @@
     api=['jupyter_server.services.api.handlers'],
     config=['jupyter_server.services.config.handlers'],
     contents=['jupyter_server.services.contents.handlers'],
-    edit=['jupyter_server.edit.handlers'],
     files=['jupyter_server.files.handlers'],
     kernels=['jupyter_server.services.kernels.handlers'],
     kernelspecs=[
@@ -574,7 +573,6 @@ class ServerApp(JupyterApp):
         'auth',
         'config',
         'contents',
-        'edit',
         'files',
         'kernels',
         'kernelspecs',

jupyter_server/edit/handlers.py

@@ -10,9 +10,9 @@
 from terminado import NamedTermManager
 from tornado.log import app_log
 from jupyter_server.utils import url_path_join as ujoin
-from .handlers import TerminalHandler, TermSocket
 from . import api_handlers
 
+
 def initialize(webapp, root_dir, connection_url, settings):
     if os.name == 'nt':
         default_shell = 'powershell.exe'
@@ -33,9 +33,6 @@ def initialize(webapp, root_dir, connection_url, settings):
     terminal_manager.log = app_log
     base_url = webapp.settings['base_url']
     handlers = [
-        (ujoin(base_url, r"/terminals/(\w+)"), TerminalHandler),
-        (ujoin(base_url, r"/terminals/websocket/(\w+)"), TermSocket,
-             {'term_manager': terminal_manager}),
         (ujoin(base_url, r"/api/terminals"), api_handlers.TerminalRootHandler),
         (ujoin(base_url, r"/api/terminals/(\w+)"), api_handlers.TerminalHandler),
     ]

jupyter_server/serverapp.py

@@ -70,40 +70,3 @@ async def test_terminal_create_with_kwargs(fetch, ws_fetch, terminal_path, kill_
 
     assert data['name'] == term_name
     await kill_all()
-
-
-async def test_terminal_create_with_cwd(
-    fetch,
-    ws_fetch,
-    terminal_path,
-    kill_all
-):
-    resp = await fetch(
-        'api', 'terminals',
-        method='POST',
-        body=json.dumps({'cwd': str(terminal_path)}),
-        allow_nonstandard_methods=True,
-    )
-
-    data = json.loads(resp.body.decode())
-    term_name = data['name']
-
-    ws = await ws_fetch(
-        'terminals', 'websocket', term_name
-    )
-    await ws.write_message(json.dumps(['stdin', 'pwd\r']))
-
-    messages = ""
-    while True:
-        try:
-            response = await asyncio.wait_for(ws.read_message(), timeout=1.0)
-        except asyncio.TimeoutError:
-            return messages
-
-        response = json.loads(response)
-        if response[0] == "stdout":
-            messages += response[1]
-
-    ws.close()
-    assert str(terminal_path) in messages
-    await kill_all()