Merge branch 'master' into 5741-building-docs

docs/source/config_overview.rst

@@ -54,12 +54,11 @@ front-end Notebook client (i.e. the familiar notebook interface).
 
 Notebook front-end client
 -------------------------
-- :ref:`How front-end configuration works <frontend_config>`
-    * :ref:`Example: Changing the notebook's default indentation setting
-      <frontend_config>`
-    * :ref:`Example: Restoring the notebook's default indentation setting
-      <frontend_config>`
-- :ref:`Persisting configuration settings <frontend_config>`
+
+.. toctree::
+   :maxdepth: 2
+
+   frontend_config
 
 .. _configure_nbextensions:
 

notebook/tests/launchnotebook.py

@@ -53,6 +53,9 @@ class NotebookTestBase(TestCase):
         for _ in range(int(MAX_WAITTIME/POLL_INTERVAL)):
             try:
                 cls.fetch_url(url)
+            except ModuleNotFoundError as error:
+                # Errors that should be immediately thrown back to caller
+                raise error
             except Exception as e:
                 if not cls.notebook_thread.is_alive():
                     raise RuntimeError("The notebook server failed to start") from e

notebook/utils.py

@@ -284,13 +284,15 @@ def check_version(v, check):
         return True
 
 
-# Copy of IPython.utils.process.check_pid:
-
 def _check_pid_win32(pid):
     import ctypes
     # OpenProcess returns 0 if no such process (of ours) exists
     # positive int otherwise
-    return bool(ctypes.windll.kernel32.OpenProcess(1,0,pid))
+    handle = ctypes.windll.kernel32.OpenProcess(1,0,pid)
+    if handle:
+        # the handle must be closed or the kernel process object won't be freed
+        ctypes.windll.kernel32.CloseHandle( handle )
+    return bool(handle)
 
 def _check_pid_posix(pid):
     """Copy of IPython.utils.process.check_pid"""

setup.py

@@ -118,8 +118,7 @@ for more information.
     extras_require = {
         'test': ['nose', 'coverage', 'requests', 'nose_warnings_filters',
                  'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'],
-        'docs': ['sphinx', 'nbsphinx', 'sphinxcontrib_github_alt',
-                 'sphinx-rtd-theme'],
+        'docs': ['sphinx', 'nbsphinx', 'sphinxcontrib_github_alt', 'sphinx_rtd_theme'],
         'test:sys_platform != "win32"': ['requests-unixsocket'],
     },
     python_requires = '>=3.5',