ipython 9.17.0__tar.gz → 9.17.1__tar.gz

{ipython-9.17.0 → ipython-9.17.1}/IPython/core/magic.py

@@ -564,6 +564,9 @@ class MagicsManager(Configurable):
         self.lazy_magics[name] = fully_qualified_name
         kinds = magic_kinds if magic_kind == "line_cell" else (magic_kind,)
         for kind in kinds:
+            existing = self.magics[kind].get(name)
+            if existing is not None and not isinstance(existing, LazyMagic):
+                continue
             self.magics[kind][name] = LazyMagic(self, fully_qualified_name, kind, name)
 
     def load_lazy(self, magic_name: str) -> None:
@@ -590,7 +593,10 @@ class MagicsManager(Configurable):
             if sep:
                 from importlib import import_module
 
-                self.register(getattr(import_module(module_name), class_name))
+                self._register(
+                    (getattr(import_module(module_name), class_name),),
+                    lazy_spec=spec,
+                )
             else:
                 assert self.shell is not None
                 self.shell.run_line_magic("load_ext", spec)
@@ -645,6 +651,22 @@ class MagicsManager(Configurable):
         ----------
         *magic_objects : one or more classes or instances
         """
+        self._register(magic_objects, lazy_spec=None)
+
+    def _register(
+        self,
+        magic_objects: tuple[type[Magics] | Magics, ...],
+        lazy_spec: str | None,
+    ) -> None:
+        """Back end of :meth:`register`.
+
+        `lazy_spec` is the spec being resolved when this registration is the
+        result of a lazy load, and None when the caller asked for it
+        explicitly.  A lazily loaded class only fills in the names it is still
+        the declared provider of: a magic somebody registered for real -- as
+        IPykernel does with ``%edit`` -- outranks a declaration, whichever
+        happens to be loaded last.
+        """
         # Start by validating them to ensure they have all had their magic
         # methods registered at the instance level
         for m in magic_objects:
@@ -661,7 +683,16 @@ class MagicsManager(Configurable):
             # table of callables
             self.registry[m.__class__.__name__] = m
             for mtype in magic_kinds:
-                self.magics[mtype].update(m.magics[mtype])
+                table = self.magics[mtype]
+                for magic_name, func in m.magics[mtype].items():
+                    if lazy_spec is not None:
+                        existing = table.get(magic_name)
+                        if existing is not None and not (
+                            isinstance(existing, LazyMagic)
+                            and existing.spec == lazy_spec
+                        ):
+                            continue
+                    table[magic_name] = func
 
     def register_function(
         self,

{ipython-9.17.0 → ipython-9.17.1}/IPython/core/release.py

@@ -16,7 +16,7 @@
 # version
 _version_major = 9
 _version_minor = 17
-_version_patch = 0
+_version_patch = 1
 _version_extra = ".dev"
 # _version_extra = "b2"
 _version_extra = ""  # Uncomment this for full releases

{ipython-9.17.0 → ipython-9.17.1}/IPython/utils/_sysinfo.py

@@ -1,2 +1,2 @@
 # GENERATED BY setup.py
-commit = "3278f6f"
+commit = "48ff029"

{ipython-9.17.0 → ipython-9.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipython
-Version: 9.17.0
+Version: 9.17.1
 Summary: IPython: Productive Interactive Computing
 Author: The IPython Development Team
 Author-email: ipython-dev@python.org

{ipython-9.17.0 → ipython-9.17.1}/ipython.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipython
-Version: 9.17.0
+Version: 9.17.1
 Summary: IPython: Productive Interactive Computing
 Author: The IPython Development Team
 Author-email: ipython-dev@python.org

{ipython-9.17.0 → ipython-9.17.1}/tests/test_magic.py

@@ -1946,6 +1946,38 @@ def test_lazy_magics():
                 ip.run_line_magic("lazy_line", "")
 
 
+def test_registered_magic_beats_lazy_one():
+    """A magic registered for real outranks one that is only declared.
+
+    IPykernel overrides core magics such as ``%edit`` by registering its own
+    class at shell init; loading the class that lazily declares them (for any
+    of the other magics it provides) must not take the override back out.
+    See https://github.com/ipython/ipython/issues/15380.
+    """
+
+    @magics_class
+    class OverridingMagics(Magics):
+        @line_magic
+        def edit(self, line):
+            print("Overridden Edit")
+
+    mm = ip.magics_manager
+    original = mm.magics["line"]["edit"]
+    try:
+        mm.register(OverridingMagics)
+        # `%load` comes from the same class as the core `%edit`.
+        mm.load_lazy("load")
+        assert mm.find("line", "edit").__self__.__class__ is OverridingMagics
+        # Neither does re-declaring the core one shadow it.
+        mm.register_lazy("edit", "IPython.core.magics.code:CodeMagics", "line")
+        assert mm.find("line", "edit").__self__.__class__ is OverridingMagics
+        mm.load_all_lazy_magics()
+        assert mm.find("line", "edit").__self__.__class__ is OverridingMagics
+    finally:
+        mm.magics["line"]["edit"] = original
+        mm.registry.pop("OverridingMagics", None)
+
+
 TEST_MODULE = """
 print('Loaded my_tmp')
 if __name__ == "__main__":