##// END OF EJS Templates
Release 5.0.0b4...
Release 5.0.0b4 What's new since b3: Small delay since last beta release, sorry about that, a few reasons though: - We / I slowed down a bit on the beta release pace, there was a few bugs/issues/User interface annoyance that needed a new version of prompt_toolkit to be released, there was no reasons to make extra-beta without this new version released. - We backed-down on some changes on which we had a few disagrements (more below). - I got sick, and had to catch up with backlog. Anyway, Jonathan release prompt_toolkit 1.0.1 and 1.0.2, so even if you don't try this new beta, upgrading prompt_toolkit will fix some of your issues. == Move back `TerminalInteractiveShell` to it's old place. This is a bigger breaking change since 5.0b3, the `TerminalInteractiveshell` moved back from `IPython.terminal.ptshell` to `IPython.terminal.interactiveshell`, if you've updated your project recently to adapt to this change we're sorry, but despite the fact that the version pre 5.0 and post 5.0 are relatively different the cost of conditional import for project depending on us appeared to be too high. So it's now easier to migrate from 4.0 to 5.0 as the class have the same name, and same location == Option name and default changed. `TerminalInteractiveShell.display_completions_in_column` is now gone. It was not present on 4.x so no API breakage there, and is now replaced by `TerminalInteractiveShell.display_completions` and is a enum that gained a 3rd mode for the completer: `readlinelike` for those of you that regret readline. This give us more flexibility for further options. Would appreciate testing of this new layout from vi user. The two other mode now being `column` and `multicolumn`. By popular request, `multicolumn` is not the default value for the previous option. == bug fixed: - quit/exit broken in ipdb - Copy/Past broken on windowm - Unicode broken on windows - function signature garbled when using `object?` - issue with paging text with `?` - completer could get stuck. See the complete git log for more informations.

File last commit:

r21515:2c9013e4
r22560:1b487f7a
Show More
shimmodule.py
92 lines | 2.7 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.
Min RK
add import hook for shim packages...
r20990 import sys
Thomas Kluyver
Add shim to preserve IPython.qt imports
r20851 import types
Min RK
use import_item in ShimModule...
r20991 from .importstring import import_item
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
class ShimImporter(object):
"""Import hook for a shim.
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
def _mirror_name(self, fullname):
"""get the name of the mirrored module"""
return self.mirror + fullname[len(self.src):]
def find_module(self, fullname, path=None):
"""Return self if we should be used to import the module."""
if fullname.startswith(self.src + '.'):
mirror_name = self._mirror_name(fullname)
try:
Min RK
Don't find importable non-modules in shim
r20992 mod = import_item(mirror_name)
Min RK
add import hook for shim packages...
r20990 except ImportError:
return
else:
Min RK
Don't find importable non-modules in shim
r20992 if not isinstance(mod, types.ModuleType):
# not a module
return None
Min RK
add import hook for shim packages...
r20990 return self
def load_module(self, fullname):
"""Import the mirrored module, and insert it into sys.modules"""
mirror_name = self._mirror_name(fullname)
Min RK
use import_item in ShimModule...
r20991 mod = import_item(mirror_name)
Min RK
add import hook for shim packages...
r20990 sys.modules[fullname] = mod
return mod
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"""
return __import__(self._mirror).__spec__
Min RK
ensure `__all__` and `__dir__` are defined on shims...
r21311
def __dir__(self):
return dir(__import__(self._mirror))
@property
def __all__(self):
"""Ensure __all__ is always defined"""
mod = __import__(self._mirror)
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)
except ImportError:
raise AttributeError(key)