Merge pull request #2865 from vmarkovtsev/master

tacaswell · tacaswell · commit 8e5f3043a34e · 2014-03-07T09:40:19.000-05:00
WebAgg: raise WebAggApplication.started flag before blocking
diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
@@ -369,17 +369,24 @@ def start(cls):
         if cls.started:
             return
 
-        if not tornado.ioloop.IOLoop.instance().running():
-            print("Press Ctrl+C to stop server")
-            try:
-                tornado.ioloop.IOLoop.instance().start()
-            except KeyboardInterrupt:
-                print("Server stopped")
-        else:
-            print("Server is running in an existing Tornado IOLoop")
-
+        # Set the flag to True *before* blocking on IOLoop.instance().start()
         cls.started = True
 
+        """
+        IOLoop.running() was removed as of Tornado 2.4; see for example
+        https://groups.google.com/forum/#!topic/python-tornado/QLMzkpQBGOY
+        Thus there is no correct way to check if the loop has already been
+        launched. We may end up with two concurrently running loops in that
+        unlucky case with all the expected consequences.
+        """
+        print("Press Ctrl+C to stop server")
+        try:
+            tornado.ioloop.IOLoop.instance().start()
+        except KeyboardInterrupt:
+            print("Server stopped")
+        finally:
+            cls.started = False
+
 
 def ipython_inline_display(figure):
     import tornado.template
