Put back TimerTornado class

martinRenou · tacaswell · commit 8fd2c590cc15 · 2021-10-20T17:29:33.000-04:00
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -21,7 +21,8 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import _Backend, NavigationToolbar2
 from matplotlib.backends.backend_webagg_core import (
-    FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg
+    FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg,
+    TimerTornado, TimerAsyncio
 )
 
 
diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
@@ -36,6 +36,7 @@
 from matplotlib.backend_bases import _Backend
 from matplotlib._pylab_helpers import Gcf
 from . import backend_webagg_core as core
+from .backend_webagg_core import TimerAsyncio, TimerTornado
 
 
 class ServerThread(threading.Thread):
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -10,6 +10,8 @@
 # - `backend_webagg.py` contains a concrete implementation of a basic
 #   application, implemented with asyncio.
 
+import asyncio
+import datetime
 from io import BytesIO, StringIO
 import json
 import logging
@@ -18,7 +20,6 @@
 
 import numpy as np
 from PIL import Image
-import asyncio
 
 from matplotlib import _api, backend_bases, backend_tools
 from matplotlib.backends import backend_agg
@@ -78,6 +79,45 @@ def _handle_key(key):
     return key
 
 
+class TimerTornado(backend_bases.TimerBase):
+    def __init__(self, *args, **kwargs):
+        self._timer = None
+        super().__init__(*args, **kwargs)
+
+    def _timer_start(self):
+        import tornado
+
+        self._timer_stop()
+        if self._single:
+            ioloop = tornado.ioloop.IOLoop.instance()
+            self._timer = ioloop.add_timeout(
+                datetime.timedelta(milliseconds=self.interval),
+                self._on_timer)
+        else:
+            self._timer = tornado.ioloop.PeriodicCallback(
+                self._on_timer,
+                max(self.interval, 1e-6))
+            self._timer.start()
+
+    def _timer_stop(self):
+        import tornado
+
+        if self._timer is None:
+            return
+        elif self._single:
+            ioloop = tornado.ioloop.IOLoop.instance()
+            ioloop.remove_timeout(self._timer)
+        else:
+            self._timer.stop()
+        self._timer = None
+
+    def _timer_set_interval(self):
+        # Only stop and restart it if the timer has already been started
+        if self._timer is not None:
+            self._timer_stop()
+            self._timer_start()
+
+
 class TimerAsyncio(backend_bases.TimerBase):
     def __init__(self, *args, **kwargs):
         self._task = None

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@`
`21`	`21`	`from matplotlib._pylab_helpers import Gcf`
`22`	`22`	`from matplotlib.backend_bases import _Backend, NavigationToolbar2`
`23`	`23`	`from matplotlib.backends.backend_webagg_core import (`
`24`		`- FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg`
	`24`	`+ FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg,`
	`25`	`+ TimerTornado, TimerAsyncio`
`25`	`26`	`)`
`26`	`27`
`27`	`28`