Skip to content

Commit a14261e

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 37bad2c commit a14261e

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

.vscode/settings.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"chat.tools.terminal.autoApprove": {
3-
"/^cd /workspaces/ipykernel && git blame -L 452,468 -- ipykernel/eventloops\\.py$/": {
4-
"approve": true,
5-
"matchCommandLine": true
6-
},
7-
"/^cd /workspaces/ipykernel && git blame -L 472,476 -- ipykernel/eventloops\\.py$/": {
8-
"approve": true,
9-
"matchCommandLine": true
10-
},
11-
"/^cd /workspaces/ipykernel && python -m pytest tests/test_async\\.py -q$/": {
12-
"approve": true,
13-
"matchCommandLine": true
14-
},
15-
"/^cd /workspaces/ipykernel && python test_loop_variants\\.py$/": {
16-
"approve": true,
17-
"matchCommandLine": true
18-
},
19-
"/^cd /workspaces/ipykernel && python -c \"from loop_asyncio_v2_poll_thread import loop_asyncio_variant_2_poll_thread, loop_asyncio_exit_variant_2; print\\('✓ Variant 2 \\(improved with run_in_executor\\) is syntactically valid'\\)\"$/": {
20-
"approve": true,
21-
"matchCommandLine": true
22-
}
2+
"chat.tools.terminal.autoApprove": {
3+
"/^cd /workspaces/ipykernel && git blame -L 452,468 -- ipykernel/eventloops\\.py$/": {
4+
"approve": true,
5+
"matchCommandLine": true
6+
},
7+
"/^cd /workspaces/ipykernel && git blame -L 472,476 -- ipykernel/eventloops\\.py$/": {
8+
"approve": true,
9+
"matchCommandLine": true
10+
},
11+
"/^cd /workspaces/ipykernel && python -m pytest tests/test_async\\.py -q$/": {
12+
"approve": true,
13+
"matchCommandLine": true
14+
},
15+
"/^cd /workspaces/ipykernel && python test_loop_variants\\.py$/": {
16+
"approve": true,
17+
"matchCommandLine": true
18+
},
19+
"/^cd /workspaces/ipykernel && python -c \"from loop_asyncio_v2_poll_thread import loop_asyncio_variant_2_poll_thread, loop_asyncio_exit_variant_2; print\\('✓ Variant 2 \\(improved with run_in_executor\\) is syntactically valid'\\)\"$/": {
20+
"approve": true,
21+
"matchCommandLine": true
2322
}
24-
}
23+
}
24+
}

ipykernel/eventloops.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ def process_stream_events(shell_stream):
462462
stop_event = asyncio.Event()
463463
t = None
464464
<<<<<<< HEAD
465-
465+
466466
>>>>>>> 29a00ff (update)
467467
=======
468468

@@ -483,7 +483,7 @@ def blocking_poll():
483483
events = poller.poll(None)
484484
if events:
485485
loop.call_soon_threadsafe(notifier)
486-
486+
487487
t = threading.Thread(target=blocking_poll, daemon=True)
488488
t.start()
489489
>>>>>>> 29a00ff (update)

0 commit comments

Comments
 (0)