From 4bc952cc118a231ff78c59e9e17ef417c4661d1c Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 8 Dec 2022 10:51:58 -0500 Subject: [PATCH 1/2] Fix error in edit magic --- ipykernel/zmqshell.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ipykernel/zmqshell.py b/ipykernel/zmqshell.py index acc1c95d3..4e7b9ecc5 100644 --- a/ipykernel/zmqshell.py +++ b/ipykernel/zmqshell.py @@ -203,8 +203,6 @@ class KernelMagics(Magics): # the magics which this class needs to implement differently from the base # class, or that are unique to it. - _find_edit_target = CodeMagics._find_edit_target - @line_magic def edit(self, parameter_s="", last_call=None): """Bring up an editor and execute the resulting code. @@ -286,7 +284,7 @@ def edit(self, parameter_s="", last_call=None): opts, args = self.parse_options(parameter_s, "prn:") try: - filename, lineno, _ = self._find_edit_target(self.shell, args, opts, last_call) + filename, lineno, _ = CodeMagics._find_edit_target(self.shell, args, opts, last_call) except MacroToEdit: # TODO: Implement macro editing over 2 processes. print("Macro editing not yet implemented in 2-process model.") From e1ba47d57fb223ef72f6cff93ba37f4cc7b2b598 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 8 Dec 2022 11:07:23 -0500 Subject: [PATCH 2/2] Fix edit magic test --- ipykernel/tests/test_zmq_shell.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ipykernel/tests/test_zmq_shell.py b/ipykernel/tests/test_zmq_shell.py index c0cc50516..52e11e43a 100644 --- a/ipykernel/tests/test_zmq_shell.py +++ b/ipykernel/tests/test_zmq_shell.py @@ -217,13 +217,9 @@ def test_magics(tmp_path): shell.user_ns["hi"] = 1 magics = KernelMagics(shell) - def find_edit_target(*args): - return str(tmp_path), 0, 1 - tmp_file = tmp_path / "test.txt" tmp_file.write_text("hi", "utf8") - magics._find_edit_target = find_edit_target - magics.edit("hi") + magics.edit(str(tmp_file)) magics.clear([]) magics.less(str(tmp_file)) if os.name == "posix":