Skip to content

Commit c220d5e

Browse files
minrkkevin-bates
authored andcommitted
patch gen.maybe_future for compatibility with tornado 6
tornado gen.maybe_future is deprecated in >= 5.0 and doesn't accept asyncio coroutine objects or awaitables in general causing failures with tornado 6 on asyncio monkeypatch gen.maybe_future for easier backport to 5.x later, we can update to use our maybe_future throughout
1 parent c2d5d95 commit c220d5e

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

jupyter_server/utils.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,10 @@ def _check_pid_posix(pid):
395395

396396
def maybe_future(obj):
397397
"""Like tornado's gen.maybe_future
398+
<<<<<<< HEAD:jupyter_server/utils.py
399+
=======
400+
401+
>>>>>>> dcee71015... patch gen.maybe_future for compatibility with tornado 6:notebook/utils.py
398402
but more compatible with asyncio for recent versions
399403
of tornado
400404
"""
@@ -420,3 +424,7 @@ def maybe_future(obj):
420424
else:
421425
import tornado.gen
422426
tornado.gen.maybe_future = maybe_future
427+
<<<<<<< HEAD:jupyter_server/utils.py
428+
=======
429+
430+
>>>>>>> dcee71015... patch gen.maybe_future for compatibility with tornado 6:notebook/utils.py

0 commit comments

Comments
 (0)