From 463cf84065e23a3a104a2e166983995a2c24204d Mon Sep 17 00:00:00 2001 From: Ian Thomas Date: Wed, 26 Nov 2025 09:25:34 +0000 Subject: [PATCH 1/2] Fix linting errors --- ipykernel/ipkernel.py | 2 +- ipykernel/kernelapp.py | 2 +- ipykernel/zmqshell.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ipykernel/ipkernel.py b/ipykernel/ipkernel.py index e1505a9a7..a6fb11883 100644 --- a/ipykernel/ipkernel.py +++ b/ipykernel/ipkernel.py @@ -292,7 +292,7 @@ def _forward_input(self, allow_stdin=False): builtins.input = self.raw_input self._save_getpass = getpass.getpass - getpass.getpass = self.getpass + getpass.getpass = self.getpass # type:ignore[assignment] def _restore_input(self): """Restore raw_input, getpass""" diff --git a/ipykernel/kernelapp.py b/ipykernel/kernelapp.py index 86b275a82..089a26086 100644 --- a/ipykernel/kernelapp.py +++ b/ipykernel/kernelapp.py @@ -694,7 +694,7 @@ def init_pdb(self): # Only available in newer IPython releases: debugger.Pdb = debugger.InterruptiblePdb # type:ignore[misc] pdb.Pdb = debugger.Pdb # type:ignore[assignment,misc] - pdb.set_trace = debugger.set_trace + pdb.set_trace = debugger.set_trace # type:ignore[assignment] @catch_config_error def initialize(self, argv=None): diff --git a/ipykernel/zmqshell.py b/ipykernel/zmqshell.py index b70b1e5fd..9e9ded064 100644 --- a/ipykernel/zmqshell.py +++ b/ipykernel/zmqshell.py @@ -352,7 +352,7 @@ def edit(self, parameter_s="", last_call=None): payload = {"source": "edit_magic", "filename": filename, "line_number": lineno} assert self.shell is not None - self.shell.payload_manager.write_payload(payload) # type: ignore[unreachable] + self.shell.payload_manager.write_payload(payload) # type: ignore[union-attr] # A few magics that are adapted to the specifics of using pexpect and a # remote terminal @@ -361,7 +361,7 @@ def edit(self, parameter_s="", last_call=None): def clear(self, arg_s): """Clear the terminal.""" assert self.shell is not None - if os.name == "posix": # type: ignore[unreachable] + if os.name == "posix": self.shell.system("clear") else: self.shell.system("cls") @@ -383,7 +383,7 @@ def less(self, arg_s): if arg_s.endswith(".py"): assert self.shell is not None - cont = self.shell.pycolorize(openpy.read_py_file(arg_s, skip_encoding_cookie=False)) # type: ignore[unreachable] + cont = self.shell.pycolorize(openpy.read_py_file(arg_s, skip_encoding_cookie=False)) else: with open(arg_s) as fid: cont = fid.read() @@ -398,7 +398,7 @@ def less(self, arg_s): def man(self, arg_s): """Find the man page for the given command and display in pager.""" assert self.shell is not None - page.page(self.shell.getoutput("man %s | col -b" % arg_s, split=False)) # type: ignore[unreachable] + page.page(self.shell.getoutput("man %s | col -b" % arg_s, split=False)) @line_magic def connect_info(self, arg_s): From 43197e786f3189b87d8f30d4a017b20ec4f4855d Mon Sep 17 00:00:00 2001 From: Ian Thomas Date: Wed, 26 Nov 2025 09:30:54 +0000 Subject: [PATCH 2/2] Iterate --- ipykernel/ipkernel.py | 2 +- ipykernel/kernelapp.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipykernel/ipkernel.py b/ipykernel/ipkernel.py index a6fb11883..e1505a9a7 100644 --- a/ipykernel/ipkernel.py +++ b/ipykernel/ipkernel.py @@ -292,7 +292,7 @@ def _forward_input(self, allow_stdin=False): builtins.input = self.raw_input self._save_getpass = getpass.getpass - getpass.getpass = self.getpass # type:ignore[assignment] + getpass.getpass = self.getpass def _restore_input(self): """Restore raw_input, getpass""" diff --git a/ipykernel/kernelapp.py b/ipykernel/kernelapp.py index 089a26086..86b275a82 100644 --- a/ipykernel/kernelapp.py +++ b/ipykernel/kernelapp.py @@ -694,7 +694,7 @@ def init_pdb(self): # Only available in newer IPython releases: debugger.Pdb = debugger.InterruptiblePdb # type:ignore[misc] pdb.Pdb = debugger.Pdb # type:ignore[assignment,misc] - pdb.set_trace = debugger.set_trace # type:ignore[assignment] + pdb.set_trace = debugger.set_trace @catch_config_error def initialize(self, argv=None):