NotificationsYou must be signed in to change notification settings
Fork8.1k
Star22.1k

Commitcced93b

authored

Merge pull request#20591 from martinRenou/asyncio_timer

MNT: defer tornado import as long as possible

2 parents7d741df +aad08b2 commitcced93bCopy full SHA for cced93b

File tree

4 files changed

+46

-6

lines changed

doc/devel
- dependencies.rst
lib/matplotlib/backends

4 files changed

+46

-6

lines changed

`‎doc/devel/dependencies.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ and the capabilities they provide.`
`46`	`46`	`*wxPython_ (>= 4) [#]_: for the wx-based backends.`
`47`	`47`	`*pycairo_ (>= 1.11.0) orcairocffi_ (>= 0.8): for the GTK and/or cairo-based`
`48`	`48`	`backends.`
`49`		`-*Tornado_: for the WebAgg backend.`
	`49`	`+*Tornado_ (>=5): for the WebAgg backend.`
`50`	`50`
`51`	`51`	`.. _Tk:https://docs.python.org/3/library/tk.html`
`52`	`52`	`.. _PyQt5:https://pypi.org/project/PyQt5/`

`‎lib/matplotlib/backends/backend_nbagg.py‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@`
`22`	`22`	`frommatplotlib.backend_basesimport_Backend,NavigationToolbar2`
`23`	`23`	`frommatplotlib.backends.backend_webagg_coreimport (`
`24`	`24`	`FigureCanvasWebAggCore,FigureManagerWebAgg,NavigationToolbar2WebAgg,`
`25`		`-TimerTornado)`
	`25`	`+TimerTornado,TimerAsyncio`
	`26`	`+)`
`26`	`27`
`27`	`28`
`28`	`29`	`defconnection_info():`

`‎lib/matplotlib/backends/backend_webagg.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`frommatplotlib.backend_basesimport_Backend`
`37`	`37`	`frommatplotlib._pylab_helpersimportGcf`
`38`	`38`	`from .importbackend_webagg_coreascore`
`39`		`-from .backend_webagg_coreimportTimerTornado`
	`39`	`+from .backend_webagg_coreimportTimerAsyncio,TimerTornado`
`40`	`40`
`41`	`41`
`42`	`42`	`classServerThread(threading.Thread):`

`‎lib/matplotlib/backends/backend_webagg_core.py‎`

Lines changed: 42 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@`
`8`	`8`	`# way over a web socket.`
`9`	`9`	`#`
`10`	`10`	# - `backend_webagg.py` contains a concrete implementation of a basic
`11`		`-# application, implemented withtornado.`
	`11`	`+# application, implemented withasyncio.`
`12`	`12`
	`13`	`+importasyncio`
`13`	`14`	`importdatetime`
`14`	`15`	`fromioimportBytesIO,StringIO`
`15`	`16`	`importjson`
`@@ -19,7 +20,6 @@`
`19`	`20`
`20`	`21`	`importnumpyasnp`
`21`	`22`	`fromPILimportImage`
`22`		`-importtornado`
`23`	`23`
`24`	`24`	`frommatplotlibimport_api,backend_bases,backend_tools`
`25`	`25`	`frommatplotlib.backendsimportbackend_agg`
`@@ -85,6 +85,8 @@ def __init__(self, args, *kwargs):`
`85`	`85`	`super().__init__(args,*kwargs)`
`86`	`86`
`87`	`87`	`def_timer_start(self):`
	`88`	`+importtornado`
	`89`	`+`
`88`	`90`	`self._timer_stop()`
`89`	`91`	`ifself._single:`
`90`	`92`	`ioloop=tornado.ioloop.IOLoop.instance()`
`@@ -98,6 +100,8 @@ def _timer_start(self):`
`98`	`100`	`self._timer.start()`
`99`	`101`
`100`	`102`	`def_timer_stop(self):`
	`103`	`+importtornado`
	`104`	`+`
`101`	`105`	`ifself._timerisNone:`
`102`	`106`	`return`
`103`	`107`	`elifself._single:`
`@@ -114,8 +118,43 @@ def _timer_set_interval(self):`
`114`	`118`	`self._timer_start()`
`115`	`119`
`116`	`120`
	`121`	`+classTimerAsyncio(backend_bases.TimerBase):`
	`122`	`+def__init__(self,args,*kwargs):`
	`123`	`+self._task=None`
	`124`	`+super().__init__(args,*kwargs)`
	`125`	`+`
	`126`	`+asyncdef_timer_task(self,interval):`
	`127`	`+whileTrue:`
	`128`	`+try:`
	`129`	`+awaitasyncio.sleep(interval)`
	`130`	`+self._on_timer()`
	`131`	`+`
	`132`	`+ifself._single:`
	`133`	`+break`
	`134`	`+exceptasyncio.CancelledError:`
	`135`	`+break`
	`136`	`+`
	`137`	`+def_timer_start(self):`
	`138`	`+self._timer_stop()`
	`139`	`+`
	`140`	`+self._task=asyncio.ensure_future(`
	`141`	`+self._timer_task(max(self.interval/1_000.,1e-6))`
	`142`	`+ )`
	`143`	`+`
	`144`	`+def_timer_stop(self):`
	`145`	`+ifself._taskisnotNone:`
	`146`	`+self._task.cancel()`
	`147`	`+self._task=None`
	`148`	`+`
	`149`	`+def_timer_set_interval(self):`
	`150`	`+# Only stop and restart it if the timer has already been started`
	`151`	`+ifself._taskisnotNone:`
	`152`	`+self._timer_stop()`
	`153`	`+self._timer_start()`
	`154`	`+`
	`155`	`+`
`117`	`156`	`classFigureCanvasWebAggCore(backend_agg.FigureCanvasAgg):`
`118`		`-_timer_cls=TimerTornado`
	`157`	`+_timer_cls=TimerAsyncio`
`119`	`158`	`# Webagg and friends having the right methods, but still`
`120`	`159`	`# having bugs in practice. Do not advertise that it works until`
`121`	`160`	`# we can debug this.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitcced93b

File tree

4 files changed

4 files changed

`‎doc/devel/dependencies.rst‎`

`‎lib/matplotlib/backends/backend_nbagg.py‎`

`‎lib/matplotlib/backends/backend_webagg.py‎`

`‎lib/matplotlib/backends/backend_webagg_core.py‎`

0 commit comments