Rename parent to nb_app

jupyter · May 18, 2020 · 9d80001 · 9d80001
1 parent 84b7b85
commit 9d80001
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
@@ -1743,7 +1743,7 @@ def init_terminals(self):
 
         try:
             from .terminal import initialize
-            initialize(parent=self)
+            initialize(nb_app=self)
             self.web_app.settings['terminals_available'] = True
         except ImportError as e:
             self.log.warning(_("Terminals not available (error was %s)"), e)

diff --git a/notebook/terminal/__init__.py b/notebook/terminal/__init__.py
@@ -14,31 +14,31 @@
 from . import api_handlers
 
 
-def initialize(parent):
+def initialize(nb_app):
     if os.name == 'nt':
         default_shell = 'powershell.exe'
     else:
         default_shell = which('sh')
-    shell = parent.terminado_settings.get('shell_command',
-        [os.environ.get('SHELL') or default_shell]
-    )
+    shell = nb_app.terminado_settings.get('shell_command',
+                                          [os.environ.get('SHELL') or default_shell]
+                                          )
     # Enable login mode - to automatically source the /etc/profile script
     if os.name != 'nt':
         shell.append('-l')
-    terminal_manager = parent.web_app.settings['terminal_manager'] = TerminalManager(
+    terminal_manager = nb_app.web_app.settings['terminal_manager'] = TerminalManager(
         shell_command=shell,
-        extra_env={'JUPYTER_SERVER_ROOT': parent.notebook_dir,
-                   'JUPYTER_SERVER_URL': parent.connection_url,
+        extra_env={'JUPYTER_SERVER_ROOT': nb_app.notebook_dir,
+                   'JUPYTER_SERVER_URL': nb_app.connection_url,
                    },
-        parent=parent,
+        parent=nb_app,
     )
-    terminal_manager.log = parent.log
-    base_url = parent.web_app.settings['base_url']
+    terminal_manager.log = nb_app.log
+    base_url = nb_app.web_app.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),
     ]
-    parent.web_app.add_handlers(".*$", handlers)
+    nb_app.web_app.add_handlers(".*$", handlers)