[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

ipykernel/debugger.py

@@ -423,7 +423,7 @@ def start(self):
             code += 'debugpy.listen(("' + host + '",' + port + "))"
             content = {"code": code, "silent": True}
 
-            #with open("debug.txt", "a") as f:
+            # with open("debug.txt", "a") as f:
             #    f.write(f"{threading.current_thread().ident} shell_socket execute_request\n")
 
             self.session.send(

ipykernel/displayhook.py

@@ -46,7 +46,7 @@ def __call__(self, obj):
             "metadata": {},
         }
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} pub_socket execute_result\n")
 
         self.session.send(
@@ -102,7 +102,7 @@ def finish_displayhook(self):
         sys.stdout.flush()
         sys.stderr.flush()
         if self.msg and self.msg["content"]["data"] and self.session:
-            #with open("debug.txt", "a") as f:
+            # with open("debug.txt", "a") as f:
             #    f.write(f"{threading.current_thread().ident} pub_socket ?finish_displayhook\n")
 
             self.session.send(self.pub_socket, self.msg, ident=self.topic)

ipykernel/iostream.py

@@ -78,13 +78,13 @@ def __init__(self, socket, pipe=False):
         self.thread.is_pydev_daemon_thread = True  # type:ignore[attr-defined]
         self.thread.name = "IOPub"
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write("    IOPubThread.__init__\n")
 
     def _thread_main(self):
         """The inner loop that's actually run in a thread"""
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} IOPubThread._thread_main\n")
 
         def _start_event_gc():
@@ -286,7 +286,7 @@ def _really_send(self, msg, *args, **kwargs):
         if self.closed:
             return
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} _really_send iopub\n")
 
         mp_mode = self._check_mp_mode()
@@ -655,7 +655,7 @@ def _flush(self):
                     if msg is None:
                         return
 
-                #with open("debug.txt", "a") as f:
+                # with open("debug.txt", "a") as f:
                 #    f.write(f"{threading.current_thread().ident} pub_thread ?OutStream.flush\n")
 
                 self.session.send(

ipykernel/kernelbase.py

@@ -277,7 +277,7 @@ def __init__(self, **kwargs):
         """Initialize the kernel."""
         super().__init__(**kwargs)
 
-        #self._iant_lock = threading.Lock()
+        # self._iant_lock = threading.Lock()
 
         # Kernel application may swap stdout and stderr to OutStream,
         # which is the case in `IPKernelApp.init_io`, hence `sys.stdout`
@@ -425,7 +425,7 @@ async def dispatch_shell(self, msg, /, stream=None, subshell_id: str | None = No
             except Exception:
                 self.log.debug("Unable to signal in pre_handler_hook:", exc_info=True)
             try:
-                #result = handler(stream, idents, msg)
+                # result = handler(stream, idents, msg)
                 result = handler(self.shell_stream, idents, msg)
                 if inspect.isawaitable(result):
                     await result
@@ -575,7 +575,7 @@ def schedule_dispatch(self, dispatch, *args):
     def start(self):
         """register dispatchers for streams"""
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"--- kernelbase start --- {threading.main_thread().ident}\n")
 
         self.io_loop = ioloop.IOLoop.current()
@@ -616,7 +616,7 @@ async def shell_channel_thread_main(self, msg):
             msg3 = self.session.deserialize(msg2, content=False, copy=False)
             subshell_id = msg3["header"].get("subshell_id")
 
-            #with open("debug.txt", "a") as f:
+            # with open("debug.txt", "a") as f:
             #    f.write(
             #        f"{threading.current_thread().ident} shell_channel_thread_main msg received for {subshell_id}\n"
             #    )
@@ -635,7 +635,7 @@ async def shell_channel_thread_main(self, msg):
     async def shell_main(self, subshell_id: str | None, msg):
         """Handler of shell messages for a single subshell"""
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} shell_main msg recvd on {subshell_id}\n")
 
         if self._supports_kernel_subshells:
@@ -683,8 +683,8 @@ def _publish_execute_input(self, code, parent, execution_count):
         """Publish the code request on the iopub stream."""
         if not self.session:
             return
-        #with self._iant_lock:
-        #with open("debug.txt", "a") as f:
+        # with self._iant_lock:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} iopub_socket execute_input\n")
 
         self.session.send(
@@ -699,8 +699,8 @@ def _publish_status(self, status, channel, parent=None):
         """send status (busy/idle) on IOPub"""
         if not self.session:
             return
-        #with self._iant_lock:
-        #with open("debug.txt", "a") as f:
+        # with self._iant_lock:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} iopub_socket status {status}\n")
         #    f.write(f"SESSION {self.session}\n")
 
@@ -721,8 +721,8 @@ def _publish_status_and_flush(self, status, channel, stream, parent=None):
     def _publish_debug_event(self, event):
         if not self.session:
             return
-        #with self._iant_lock:
-        #with open("debug.txt", "a") as f:
+        # with self._iant_lock:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} iopub_socket debug_event\n")
 
         self.session.send(
@@ -793,7 +793,7 @@ def send_response(
         if not self.session:
             return None
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? ?send_response\n")
 
         return self.session.send(
@@ -871,7 +871,7 @@ async def execute_request(self, stream, ident, parent):
         subshell_id = parent["header"].get("subshell_id")
         msg_id = parent["header"].get("msg_id")
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(
         #        f"{threading.current_thread().ident} about to execute_request {msg_id} {subshell_id} {code}\n"
         #    )
@@ -895,7 +895,7 @@ async def execute_request(self, stream, ident, parent):
         reply_content = json_clean(reply_content)
         metadata = self.finish_metadata(parent, metadata, reply_content)
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(
         #        f"{threading.current_thread().ident} execute_reply            {msg_id} {subshell_id} {reply_content}\n"
         #    )
@@ -990,7 +990,7 @@ async def history_request(self, stream, ident, parent):
 
         reply_content = json_clean(reply_content)
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? history_reply\n")
 
         msg = self.session.send(stream, "history_reply", reply_content, parent, ident)
@@ -1018,7 +1018,7 @@ async def connect_request(self, stream, ident, parent):
         content = self._recorded_ports.copy() if self._recorded_ports else {}
         content["status"] = "ok"
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? connect_reply\n")
 
         msg = self.session.send(stream, "connect_reply", content, parent, ident)
@@ -1046,7 +1046,7 @@ async def kernel_info_request(self, stream, ident, parent):
         content = {"status": "ok"}
         content.update(self.kernel_info)
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? kernel_info_reply\n")
 
         msg = self.session.send(stream, "kernel_info_reply", content, parent, ident)
@@ -1117,7 +1117,7 @@ async def shutdown_request(self, stream, ident, parent):
         if inspect.isawaitable(content):
             content = await content
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? shutdown_reply\n")
 
         self.session.send(stream, "shutdown_reply", content, parent, ident=ident)
@@ -1171,7 +1171,7 @@ async def debug_request(self, stream, ident, parent):
             reply_content = await reply_content
         reply_content = json_clean(reply_content)
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? debug_reply\n")
 
         reply_msg = self.session.send(stream, "debug_reply", reply_content, parent, ident)
@@ -1236,7 +1236,7 @@ async def create_subshell_request(self, socket, ident, parent) -> None:
             self.log.error("Subshells are not supported by this kernel")
             return
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? create_subshell_request\n")
 
         assert threading.current_thread().name == CONTROL_THREAD_NAME
@@ -1247,7 +1247,7 @@ async def create_subshell_request(self, socket, ident, parent) -> None:
         other_socket.send_json({"type": "create"})
         reply = other_socket.recv_json()
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? create_subshell_reply\n")
 
         self.session.send(socket, "create_subshell_reply", reply, parent, ident)
@@ -1274,7 +1274,7 @@ async def delete_subshell_request(self, socket, ident, parent) -> None:
         other_socket.send_json({"type": "delete", "subshell_id": subshell_id})
         reply = other_socket.recv_json()
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? delete_subshell_reply\n")
 
         self.session.send(socket, "delete_subshell_reply", reply, parent, ident)
@@ -1294,7 +1294,7 @@ async def list_subshell_request(self, socket, ident, parent) -> None:
         other_socket.send_json({"type": "list"})
         reply = other_socket.recv_json()
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? list_subshell_reply\n")
 
         self.session.send(socket, "list_subshell_reply", reply, parent, ident)
@@ -1362,7 +1362,7 @@ async def abort_request(self, stream, ident, parent):  # pragma: no cover
         if not self.session:
             return
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? abort_reply\n")
 
         reply_msg = self.session.send(
@@ -1463,7 +1463,7 @@ def _send_abort_reply(self, stream, msg, idents):
         md = self.finish_metadata(msg, md, status)
         md.update(status)
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{threading.current_thread().ident} ? {reply_type}\n")
 
         self.session.send(
@@ -1646,8 +1646,8 @@ async def _at_shutdown(self):
 
         finally:
             if self._shutdown_message is not None and self.session:
-                #with self._iant_lock:
-                #with open("debug.txt", "a") as f:
+                # with self._iant_lock:
+                # with open("debug.txt", "a") as f:
                 #    f.write(f"{threading.current_thread().ident} ? _shutdown\n")
 
                 self.session.send(

ipykernel/subshell_manager.py

@@ -224,15 +224,15 @@ def _process_control_request(
     def _send_on_shell_channel(self, msg) -> None:
         assert current_thread().name == SHELL_CHANNEL_THREAD_NAME
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{current_thread().ident} _send_on_shell_channel - start {msg}\n")
 
         with self._lock_shell_socket:
-            #with open("debug.txt", "a") as f:
+            # with open("debug.txt", "a") as f:
             #    f.write(f"   {self._shell_socket}\n")
             self._shell_socket.send_multipart(msg)
 
-        #with open("debug.txt", "a") as f:
+        # with open("debug.txt", "a") as f:
         #    f.write(f"{current_thread().ident} _send_on_shell_channel - end\n")
 
     def _stop_subshell(self, subshell_thread: SubshellThread) -> None:

ipykernel/thread.py

@@ -23,7 +23,7 @@ def __init__(self, **kwargs):
     def run(self) -> None:
         """Run the thread."""
         try:
-            #with open("debug.txt", "a") as f:
+            # with open("debug.txt", "a") as f:
             #    f.write(f"{threading.current_thread().ident} io_loop - about to start\n")
 
             self.io_loop.start()

tests/test_subshells.py

@@ -20,7 +20,7 @@ def create_subshell_helper(kc: BlockingKernelClient):
     kc.control_channel.send(msg)
     msg_id = msg["header"]["msg_id"]
     reply = get_reply(kc, msg_id, TIMEOUT, channel="control")
-    #wait_for_idle(kc, msg_id)
+    # wait_for_idle(kc, msg_id)
     return reply["content"]
 
 
@@ -29,7 +29,7 @@ def delete_subshell_helper(kc: BlockingKernelClient, subshell_id: str):
     kc.control_channel.send(msg)
     msg_id = msg["header"]["msg_id"]
     reply = get_reply(kc, msg_id, TIMEOUT, channel="control")
-    #wait_for_idle(kc, msg_id)
+    # wait_for_idle(kc, msg_id)
     return reply["content"]
 
 
@@ -38,7 +38,7 @@ def list_subshell_helper(kc: BlockingKernelClient):
     kc.control_channel.send(msg)
     msg_id = msg["header"]["msg_id"]
     reply = get_reply(kc, msg_id, TIMEOUT, channel="control")
-    #wait_for_idle(kc, msg_id)
+    # wait_for_idle(kc, msg_id)
     return reply["content"]
 
 
@@ -52,23 +52,22 @@ def execute_request(kc: BlockingKernelClient, code: str, subshell_id: str | None
 def execute_request_subshell_id(
     kc: BlockingKernelClient, code: str, subshell_id: str | None, terminator: str = "\n"
 ):
-
-    #with open("debug.txt", "a") as f:
+    # with open("debug.txt", "a") as f:
     #    f.write("CHECK 1\n")
 
     msg = execute_request(kc, code, subshell_id)
 
-    #with open("debug.txt", "a") as f:
+    # with open("debug.txt", "a") as f:
     #    f.write("CHECK 2\n")
 
     msg_id = msg["header"]["msg_id"]
 
-    #with open("debug.txt", "a") as f:
+    # with open("debug.txt", "a") as f:
     #    f.write("CHECK 3\n")
 
     stdout, _ = assemble_output(kc.get_iopub_msg, None, msg_id)
 
-    #with open("debug.txt", "a") as f:
+    # with open("debug.txt", "a") as f:
     #    f.write("CHECK 4\n")
 
     return stdout.strip()
@@ -126,7 +125,7 @@ def test_thread_ids():
         thread_id, main_thread_id = execute_thread_ids(kc)
         assert thread_id == main_thread_id
 
-        thread_id, main_thread_id = execute_thread_ids(kc, subshell_id)   # This is the problem
+        thread_id, main_thread_id = execute_thread_ids(kc, subshell_id)  # This is the problem
         assert thread_id != main_thread_id
 
         delete_subshell_helper(kc, subshell_id)