##// END OF EJS Templates
Improve typing and MIME hook API for inspector (#14342)...
Improve typing and MIME hook API for inspector (#14342) Fixes https://github.com/ipython/ipython/issues/14339 ### Additions Adds `InfoDict` type to improve the typing of `info()` result. Adds missing `"subclasses"` to `info_fields` list (these were added to the field list in https://github.com/ipython/ipython/pull/11486 but we forgot to update `info_fields` variable at the time) - the newly added `InfoDict` type will ensure that this won't happen again. Adds `InspectorHookData` dataclass which is passed to the MIME hooks which now should expect a single argument. Having a single dataclass argument enables us to deprecate individual fields, or add new fields without breaking the existing hooks. The old hooks will still work (if any are out there since this mechanism got just added in the previous point version). ### Deletions A comment over `info_fields` gets deleted: - Contrarily to the comment (which is getting deleted in this PR), `info_fields` were not defining the order of display since at least 2015 (https://github.com/ipython/ipython/pull/7903 - I did not feel the need to go further in the history to find when exactly it happened). - Also contrarily to this comment, current Jupyter messaging spec does not define the contents of `info_fields` (I guess this was lost during IPython/Jupyter split), but the newly added `InfoDict` at least properly annotates their type (if you know where I can find the old IPython messaging spec with the descriptions I can add these as doc comments). Unused `cast_unicode` import gets deleted. If someone imported it from here... well they really should not have. ### Deprecations - mime hooks taking two arguments (`obj, info`)

File last commit:

r27453:90fdcaf8
r28661:2084e7f3 merge
Show More
shimmodule.py
89 lines | 2.6 KiB | text/x-python | PythonLexer
Thomas Kluyver
Add shim to preserve IPython.qt imports
r20851 """A shim module for deprecated imports
"""
# Copyright (c) IPython Development Team.
# Distributed under the terms of the Modified BSD License.
Nikita Kniazev
ShimImporter: implement modern interface
r27078 import importlib.abc
import importlib.util
Min RK
add import hook for shim packages...
r20990 import sys
Thomas Kluyver
Add shim to preserve IPython.qt imports
r20851 import types
Diego Garcia
use `import_module` instead of `__import__` ( FIX #10008 )
r22954 from importlib import import_module
Thomas Kluyver
Add shim to preserve IPython.qt imports
r20851
Min RK
use import_item in ShimModule...
r20991 from .importstring import import_item
Diego Garcia
use `import_module` instead of `__import__` ( FIX #10008 )
r22954
Min RK
add ShimWarning for shimmed imports...
r21515 class ShimWarning(Warning):
"""A warning to show when a module has moved, and a shim is in its place."""
Min RK
add import hook for shim packages...
r20990
Nikita Kniazev
ShimImporter: implement modern interface
r27078
class ShimImporter(importlib.abc.MetaPathFinder):
Min RK
add import hook for shim packages...
r20990 """Import hook for a shim.
Nikita Kniazev
ShimImporter: implement modern interface
r27078
Min RK
add import hook for shim packages...
r20990 This ensures that submodule imports return the real target module,
not a clone that will confuse `is` and `isinstance` checks.
"""
def __init__(self, src, mirror):
self.src = src
self.mirror = mirror
Nikita Kniazev
ShimImporter: implement modern interface
r27078
Min RK
add import hook for shim packages...
r20990 def _mirror_name(self, fullname):
"""get the name of the mirrored module"""
Nikita Kniazev
ShimImporter: implement modern interface
r27078 return self.mirror + fullname[len(self.src) :]
def find_spec(self, fullname, path, target=None):
if fullname.startswith(self.src + "."):
Min RK
add import hook for shim packages...
r20990 mirror_name = self._mirror_name(fullname)
Nikita Kniazev
ShimImporter: implement modern interface
r27078 return importlib.util.find_spec(mirror_name)
Min RK
add import hook for shim packages...
r20990
Thomas Kluyver
Add shim to preserve IPython.qt imports
r20851 class ShimModule(types.ModuleType):
def __init__(self, *args, **kwargs):
self._mirror = kwargs.pop("mirror")
Min RK
add import hook for shim packages...
r20990 src = kwargs.pop("src", None)
if src:
kwargs['name'] = src.rsplit('.', 1)[-1]
Thomas Kluyver
Add shim to preserve IPython.qt imports
r20851 super(ShimModule, self).__init__(*args, **kwargs)
Min RK
add import hook for shim packages...
r20990 # add import hook for descendent modules
if src:
sys.meta_path.append(
ShimImporter(src=src, mirror=self._mirror)
)
@property
def __path__(self):
return []
Min RK
Don't import mirror for `__spec__` until requested...
r20953 @property
def __spec__(self):
"""Don't produce __spec__ until requested"""
Diego Garcia
use `import_module` instead of `__import__` ( FIX #10008 )
r22954 return import_module(self._mirror).__spec__
Min RK
ensure `__all__` and `__dir__` are defined on shims...
r21311
def __dir__(self):
Diego Garcia
use `import_module` instead of `__import__` ( FIX #10008 )
r22954 return dir(import_module(self._mirror))
Min RK
ensure `__all__` and `__dir__` are defined on shims...
r21311
@property
def __all__(self):
"""Ensure __all__ is always defined"""
Diego Garcia
use `import_module` instead of `__import__` ( FIX #10008 )
r22954 mod = import_module(self._mirror)
Min RK
ensure `__all__` and `__dir__` are defined on shims...
r21311 try:
return mod.__all__
except AttributeError:
return [name for name in dir(mod) if not name.startswith('_')]
Thomas Kluyver
Add shim to preserve IPython.qt imports
r20851
def __getattr__(self, key):
# Use the equivalent of import_item(name), see below
name = "%s.%s" % (self._mirror, key)
Min RK
use import_item in ShimModule...
r20991 try:
return import_item(name)
Ram Rachum
Fix exception causes all over the codebase
r25833 except ImportError as e:
raise AttributeError(key) from e
Jochen Ott
Add fallback for utils.ShimModule.__repr__
r27453
def __repr__(self):
# repr on a module can be called during error handling; make sure
# it does not fail, even if the import fails
try:
return self.__getattr__("__repr__")()
except AttributeError:
return f"<ShimModule for {self._mirror!r}>"