##// END OF EJS Templates
First step in reintegrating Jedi...
First step in reintegrating Jedi If Jedi is installed expose a private API use it with prompt toolkit. Jedi does not _yet_ provide all the completion IPython has, so this is still a bit awkward. In order to debug this (and see what is Jedi provided we for now inject a fake Jedi/IPython delimiter in the menu. Jedi completion and this behavior are enabled by default, but could likely be opt-in. Add also a number of debug flags to be able to track why jedi is not working, and/or what completions are found by IPython and not Jedi. That should give us a bit of heads up and feedback to know whether we can remove part of the IPython completer, and more especially if we can drop `python_matches`. Once `python_matches` is dropped and some other of the current matchers are either dropped or converted to the new API, that should simplify the internal quite a bit. That would just be too much for an already BIG pull-request.

File last commit:

r23075:108df85c
r23284:3ff1be2e
Show More
extensions.py
170 lines | 6.3 KiB | text/x-python | PythonLexer
Brian Granger
First draft of refactored Component->Configurable.
r2731 # encoding: utf-8
MinRK
add utils.path.ensure_dir_exists...
r16486 """A class for managing IPython extensions."""
Brian Granger
First draft of refactored Component->Configurable.
r2731
MinRK
add utils.path.ensure_dir_exists...
r16486 # Copyright (c) IPython Development Team.
# Distributed under the terms of the Modified BSD License.
Brian Granger
First draft of refactored Component->Configurable.
r2731
import os
Thomas Kluyver
Fix installing extension from local file on Windows....
r6578 from shutil import copyfile
Brian Granger
First draft of refactored Component->Configurable.
r2731 import sys
Diego Garcia
use `import_module` instead of `__import__` ( FIX #10008 )
r22954 from importlib import import_module
Brian Granger
First draft of refactored Component->Configurable.
r2731
Min RK
update dependency imports...
r21253 from traitlets.config.configurable import Configurable
MinRK
add utils.path.ensure_dir_exists...
r16486 from IPython.utils.path import ensure_dir_exists
Min RK
update dependency imports...
r21253 from traitlets import Instance
Matthias Bussonnier
use try/except also for Py2....
r21258
try:
from importlib import reload
except ImportError :
## deprecated since 3.4
from imp import reload
Brian Granger
First draft of refactored Component->Configurable.
r2731
#-----------------------------------------------------------------------------
# Main class
#-----------------------------------------------------------------------------
class ExtensionManager(Configurable):
Brian Granger
Finishing work on configurables, plugins and extensions.
r2738 """A class to manage IPython extensions.
Brian Granger
First draft of refactored Component->Configurable.
r2731
Brian Granger
Finishing work on configurables, plugins and extensions.
r2738 An IPython extension is an importable Python module that has
a function with the signature::
def load_ipython_extension(ipython):
# Do things with ipython
Bernardo B. Marques
remove all trailling spaces
r4872 This function is called after your extension is imported and the
Brian Granger
Finishing work on configurables, plugins and extensions.
r2738 currently active :class:`InteractiveShell` instance is passed as
the only argument. You can do anything you want with IPython at
that point, including defining new magic and aliases, adding new
components, etc.
Thomas Kluyver
Extension manager refuses to load extension more than once
r8549
MinRK
use `parent=self` throughout IPython...
r11064 You can also optionally define an :func:`unload_ipython_extension(ipython)`
Thomas Kluyver
Extension manager refuses to load extension more than once
r8549 function, which will be called if the user unloads or reloads the extension.
The extension manager will only call :func:`load_ipython_extension` again
if the extension is reloaded.
Brian Granger
Finishing work on configurables, plugins and extensions.
r2738
You can put your extension modules anywhere you want, as long as
they can be imported by Python's standard import mechanism. However,
to make it easy to write extensions, you can also put your extensions
in ``os.path.join(self.ipython_dir, 'extensions')``. This directory
is added to ``sys.path`` automatically.
"""
Matthias Bussonnier
fix Traitlets 4.2 API usage.
r22350 shell = Instance('IPython.core.interactiveshell.InteractiveShellABC', allow_none=True)
Brian Granger
First draft of refactored Component->Configurable.
r2731
MinRK
use `parent=self` throughout IPython...
r11064 def __init__(self, shell=None, **kwargs):
super(ExtensionManager, self).__init__(shell=shell, **kwargs)
Matthias Bussonnier
Update IPython/core/extensions.py to the new traitlets API
r22325 self.shell.observe(
self._on_ipython_dir_changed, names=('ipython_dir',)
Brian Granger
First draft of refactored Component->Configurable.
r2731 )
Thomas Kluyver
Add a set to track what extensions are loaded.
r8515 self.loaded = set()
Brian Granger
First draft of refactored Component->Configurable.
r2731
@property
def ipython_extension_dir(self):
return os.path.join(self.shell.ipython_dir, u'extensions')
Matthias Bussonnier
Update IPython/core/extensions.py to the new traitlets API
r22325 def _on_ipython_dir_changed(self, change):
MinRK
add utils.path.ensure_dir_exists...
r16486 ensure_dir_exists(self.ipython_extension_dir)
Brian Granger
First draft of refactored Component->Configurable.
r2731
def load_extension(self, module_str):
"""Load an IPython extension by its module name.
Thomas Kluyver
Extension manager refuses to load extension more than once
r8549 Returns the string "already loaded" if the extension is already loaded,
Thomas Kluyver
Add message when trying to %load_ext a module that is not an IPython extension.
r8586 "no load function" if the module doesn't have a load_ipython_extension
function, or None if it succeeded.
Brian Granger
First draft of refactored Component->Configurable.
r2731 """
Thomas Kluyver
Extension manager refuses to load extension more than once
r8549 if module_str in self.loaded:
return "already loaded"
Brian Granger
First draft of refactored Component->Configurable.
r2731 from IPython.utils.syspathcontext import prepended_to_syspath
MinRK
load extensions in builtin trap...
r10574
with self.shell.builtin_trap:
if module_str not in sys.modules:
with prepended_to_syspath(self.ipython_extension_dir):
Diego Garcia
use `import_module` instead of `__import__` ( FIX #10008 )
r22954 import_module(module_str)
MinRK
load extensions in builtin trap...
r10574 mod = sys.modules[module_str]
if self._call_load_ipython_extension(mod):
self.loaded.add(module_str)
else:
return "no load function"
Brian Granger
First draft of refactored Component->Configurable.
r2731
def unload_extension(self, module_str):
"""Unload an IPython extension by its module name.
This function looks up the extension's name in ``sys.modules`` and
simply calls ``mod.unload_ipython_extension(self)``.
Thomas Kluyver
Extension manager refuses to load extension more than once
r8549
Returns the string "no unload function" if the extension doesn't define
a function to unload itself, "not loaded" if the extension isn't loaded,
otherwise None.
Brian Granger
First draft of refactored Component->Configurable.
r2731 """
Thomas Kluyver
Extension manager refuses to load extension more than once
r8549 if module_str not in self.loaded:
return "not loaded"
Brian Granger
First draft of refactored Component->Configurable.
r2731 if module_str in sys.modules:
mod = sys.modules[module_str]
Thomas Kluyver
Add a set to track what extensions are loaded.
r8515 if self._call_unload_ipython_extension(mod):
self.loaded.discard(module_str)
Thomas Kluyver
Extension manager refuses to load extension more than once
r8549 else:
return "no unload function"
Brian Granger
First draft of refactored Component->Configurable.
r2731
def reload_extension(self, module_str):
"""Reload an IPython extension by calling reload.
If the module has not been loaded before,
:meth:`InteractiveShell.load_extension` is called. Otherwise
:func:`reload` is called and then the :func:`load_ipython_extension`
function of the module, if it exists is called.
"""
from IPython.utils.syspathcontext import prepended_to_syspath
Thomas Kluyver
Unload extension before reloading it.
r8517 if (module_str in self.loaded) and (module_str in sys.modules):
self.unload_extension(module_str)
mod = sys.modules[module_str]
with prepended_to_syspath(self.ipython_extension_dir):
Brian Granger
First draft of refactored Component->Configurable.
r2731 reload(mod)
Thomas Kluyver
Unload extension before reloading it.
r8517 if self._call_load_ipython_extension(mod):
self.loaded.add(module_str)
else:
self.load_extension(module_str)
Brian Granger
First draft of refactored Component->Configurable.
r2731
def _call_load_ipython_extension(self, mod):
if hasattr(mod, 'load_ipython_extension'):
Thomas Kluyver
Add a set to track what extensions are loaded.
r8515 mod.load_ipython_extension(self.shell)
return True
Brian Granger
First draft of refactored Component->Configurable.
r2731
def _call_unload_ipython_extension(self, mod):
if hasattr(mod, 'unload_ipython_extension'):
Thomas Kluyver
Add a set to track what extensions are loaded.
r8515 mod.unload_ipython_extension(self.shell)
return True
Sean Vig
Fix Python 3 handling of urllib...
r13640
Thomas Kluyver
Add %install_ext magic function.
r6128 def install_extension(self, url, filename=None):
"""Download and install an IPython extension.
Sean Vig
Fix Python 3 handling of urllib...
r13640
Thomas Kluyver
Add %install_ext magic function.
r6128 If filename is given, the file will be so named (inside the extension
directory). Otherwise, the name from the URL will be used. The file must
have a .py or .zip extension; otherwise, a ValueError will be raised.
Sean Vig
Fix Python 3 handling of urllib...
r13640
Thomas Kluyver
install_extension always returns the path to the installed file.
r6617 Returns the full path to the installed file.
Thomas Kluyver
Add %install_ext magic function.
r6128 """
# Ensure the extension directory exists
MinRK
add utils.path.ensure_dir_exists...
r16486 ensure_dir_exists(self.ipython_extension_dir)
Sean Vig
Fix Python 3 handling of urllib...
r13640
Thomas Kluyver
Fix installing extension from local file on Windows....
r6578 if os.path.isfile(url):
src_filename = os.path.basename(url)
copy = copyfile
else:
Sean Vig
Fix Python 3 handling of urllib...
r13640 # Deferred imports
Srinivas Reddy Thatiparthy
remove python 2.x specific urllib2's functions
r23075 from urllib.parse import urlparse
from urllib.request import urlretrieve
Thomas Kluyver
Fix installing extension from local file on Windows....
r6578 src_filename = urlparse(url).path.split('/')[-1]
copy = urlretrieve
Sean Vig
Fix Python 3 handling of urllib...
r13640
Thomas Kluyver
Add %install_ext magic function.
r6128 if filename is None:
Thomas Kluyver
Fix installing extension from local file on Windows....
r6578 filename = src_filename
Thomas Kluyver
Add %install_ext magic function.
r6128 if os.path.splitext(filename)[1] not in ('.py', '.zip'):
raise ValueError("The file must have a .py or .zip extension", filename)
Sean Vig
Fix Python 3 handling of urllib...
r13640
Thomas Kluyver
Add %install_ext magic function.
r6128 filename = os.path.join(self.ipython_extension_dir, filename)
Thomas Kluyver
install_extension always returns the path to the installed file.
r6617 copy(url, filename)
return filename