From 58ecfc2376490c7dd617eb8b2efa77570e9d0628 Mon Sep 17 00:00:00 2001 From: MinRK Date: Sun, 31 Aug 2014 21:50:16 -0700 Subject: [PATCH] catch any exception while waiting to connect requests 2.4 changed the exception type for a failed connection --- IPython/html/tests/launchnotebook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPython/html/tests/launchnotebook.py b/IPython/html/tests/launchnotebook.py index 42ae76869..e49fe80db 100644 --- a/IPython/html/tests/launchnotebook.py +++ b/IPython/html/tests/launchnotebook.py @@ -37,7 +37,7 @@ class NotebookTestBase(TestCase): for _ in range(int(MAX_WAITTIME/POLL_INTERVAL)): try: requests.get(url) - except requests.exceptions.ConnectionError: + except Exception as e: if cls.notebook.poll() is not None: raise RuntimeError("The notebook server exited with status %s" \ % cls.notebook.poll())