##// END OF EJS Templates
fix IPython.embed...
fix IPython.embed without this change, IPython.embed throws the following traceback: File "explete.py", line 9, in dump_inputs IPython.embed() File "/home/pi/code/ipython/IPython/terminal/embed.py", line 287, in embed config = load_default_config() File "/home/pi/code/ipython/IPython/terminal/ipapp.py", line 379, in load_default_config for cf in Application._load_config_files("ipython_config", path=profile_dir): File "/home/pi/code/ipython/IPython/config/application.py", line 527, in _load_config_files log.debug("Loaded config file: %s", loader.full_filename) AttributeError: 'NoneType' object has no attribute 'debug' @Carreau was the last to poke around in this part of the code, so pinging him, just in case

File last commit:

r13870:da7cc9d7
r14174:2c0e86ab
Show More
loader.py
840 lines | 27.9 KiB | text/x-python | PythonLexer
Brian Granger
Massive refactoring of of the core....
r2245 """A simple configuration system.
Thomas Kluyver
Only include inheritance diagram where it's useful.
r8795 Inheritance diagram:
.. inheritance-diagram:: IPython.config.loader
:parts: 3
Fernando Perez
Fix printing of argparse help to go to stdout by default....
r2361 Authors
-------
Brian Granger
Massive refactoring of of the core....
r2245 * Brian Granger
Fernando Perez
Fix printing of argparse help to go to stdout by default....
r2361 * Fernando Perez
MinRK
update recently changed modules with Authors in docstring
r4018 * Min RK
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """
#-----------------------------------------------------------------------------
MinRK
update recently changed modules with Authors in docstring
r4018 # Copyright (C) 2008-2011 The IPython Development Team
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Thomas Kluyver
Import argparse directly from stdlib
r12547 import argparse
MinRK
add LazyConfigValue...
r12795 import copy
MinRK
expand '~' with path.expanduser in KVLoader...
r5189 import os
MinRK
move shortname to Application...
r3852 import re
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 import sys
Matthias BUSSONNIER
allow to load config from json file...
r13771 import json
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
MinRK
load_subconfig supports profiles...
r4030 from IPython.utils.path import filefind, get_ipython_dir
Matthias BUSSONNIER
allow to load config from json file...
r13771 from IPython.utils import py3compat
Brandon Parsons
saner default encoding mechanism
r6716 from IPython.utils.encoding import DEFAULT_ENCODING
MinRK
remove unnecessary builtin import
r13467 from IPython.utils.py3compat import unicode_type, iteritems
MinRK
add LazyConfigValue...
r12795 from IPython.utils.traitlets import HasTraits, List, Any, TraitError
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
#-----------------------------------------------------------------------------
Brian Granger
Massive refactoring of of the core....
r2245 # Exceptions
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 #-----------------------------------------------------------------------------
Brian Granger
Massive refactoring of of the core....
r2245 class ConfigError(Exception):
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 pass
Brian Granger
Massive refactoring of of the core....
r2245 class ConfigLoaderError(ConfigError):
pass
MinRK
avoid interpreting IOError in config file as file-not-found...
r4905 class ConfigFileNotFound(ConfigError):
pass
MinRK
print usage on invalid command-line arguments
r3951 class ArgumentError(ConfigLoaderError):
pass
Fernando Perez
Fix printing of argparse help to go to stdout by default....
r2361 #-----------------------------------------------------------------------------
# Argparse fix
#-----------------------------------------------------------------------------
Brian Granger
Work on the config system....
r2500
Fernando Perez
Fix printing of argparse help to go to stdout by default....
r2361 # Unfortunately argparse by default prints help messages to stderr instead of
# stdout. This makes it annoying to capture long help screens at the command
# line, since one must know how to pipe stderr, which many users don't know how
# to do. So we override the print_help method with one that defaults to
# stdout and use our class instead.
class ArgumentParser(argparse.ArgumentParser):
"""Simple argparse subclass that prints help to stdout by default."""
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Fix printing of argparse help to go to stdout by default....
r2361 def print_help(self, file=None):
if file is None:
file = sys.stdout
return super(ArgumentParser, self).print_help(file)
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Fix printing of argparse help to go to stdout by default....
r2361 print_help.__doc__ = argparse.ArgumentParser.print_help.__doc__
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Massive refactoring of of the core....
r2245 #-----------------------------------------------------------------------------
# Config class for holding config information
#-----------------------------------------------------------------------------
MinRK
add LazyConfigValue...
r12795 class LazyConfigValue(HasTraits):
"""Proxy object for exposing methods on configurable containers
Exposes:
- append, extend, insert on lists
- update on dicts
- update, add on sets
"""
_value = None
# list methods
_extend = List()
MinRK
add LazyConfig.prepend
r12807 _prepend = List()
MinRK
add LazyConfigValue...
r12795
def append(self, obj):
self._extend.append(obj)
def extend(self, other):
self._extend.extend(other)
MinRK
add LazyConfig.prepend
r12807 def prepend(self, other):
"""like list.extend, but for the front"""
self._prepend[:0] = other
MinRK
add LazyConfigValue...
r12795 _inserts = List()
def insert(self, index, other):
if not isinstance(index, int):
raise TypeError("An integer is required")
self._inserts.append((index, other))
# dict methods
# update is used for both dict and set
_update = Any()
def update(self, other):
if self._update is None:
if isinstance(other, dict):
self._update = {}
else:
self._update = set()
self._update.update(other)
# set methods
def add(self, obj):
self.update({obj})
def get_value(self, initial):
"""construct the value from the initial one
after applying any insert / extend / update changes
"""
if self._value is not None:
return self._value
value = copy.deepcopy(initial)
if isinstance(value, list):
for idx, obj in self._inserts:
value.insert(idx, obj)
MinRK
add LazyConfig.prepend
r12807 value[:0] = self._prepend
MinRK
add LazyConfigValue...
r12795 value.extend(self._extend)
MinRK
add LazyConfig.prepend
r12807
MinRK
add LazyConfigValue...
r12795 elif isinstance(value, dict):
if self._update:
value.update(self._update)
elif isinstance(value, set):
if self._update:
value.update(self._update)
self._value = value
return value
def to_dict(self):
"""return JSONable dict form of my data
MinRK
add LazyConfig.prepend
r12807 Currently update as dict or set, extend, prepend as lists, and inserts as list of tuples.
MinRK
add LazyConfigValue...
r12795 """
d = {}
if self._update:
d['update'] = self._update
if self._extend:
d['extend'] = self._extend
MinRK
add LazyConfig.prepend
r12807 if self._prepend:
d['prepend'] = self._prepend
MinRK
add LazyConfigValue...
r12795 elif self._inserts:
d['inserts'] = self._inserts
return d
Brian Granger
Massive refactoring of of the core....
r2245
MinRK
cleanup Config attributes...
r13450 def _is_section_key(key):
"""Is a Config key a section name (does it start with a capital)?"""
if key and key[0].upper()==key[0] and not key.startswith('_'):
return True
else:
return False
Brian Granger
Massive refactoring of of the core....
r2245 class Config(dict):
"""An attribute based dict that can do smart merges."""
def __init__(self, *args, **kwds):
dict.__init__(self, *args, **kwds)
MinRK
fix creating config objects from dicts...
r10871 self._ensure_subconfig()
def _ensure_subconfig(self):
"""ensure that sub-dicts that should be Config objects are
casts dicts that are under section keys to Config objects,
which is necessary for constructing Config objects from dict literals.
"""
for key in self:
obj = self[key]
MinRK
cleanup Config attributes...
r13450 if _is_section_key(key) \
MinRK
fix creating config objects from dicts...
r10871 and isinstance(obj, dict) \
and not isinstance(obj, Config):
MinRK
cleanup Config attributes...
r13450 setattr(self, key, Config(obj))
MinRK
make Config.merge a public method...
r10873
Brian Granger
Massive refactoring of of the core....
r2245 def _merge(self, other):
MinRK
make Config.merge a public method...
r10873 """deprecated alias, use Config.merge()"""
self.merge(other)
def merge(self, other):
"""merge another config object into this one"""
Brian Granger
Massive refactoring of of the core....
r2245 to_update = {}
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for k, v in iteritems(other):
Bradley M. Froehle
2to3: Apply has_key fixer.
r7859 if k not in self:
MinRK
copy values in Config.merge
r13471 to_update[k] = copy.deepcopy(v)
Brian Granger
Massive refactoring of of the core....
r2245 else: # I have this key
MinRK
make Config.merge a public method...
r10873 if isinstance(v, Config) and isinstance(self[k], Config):
Brian Granger
Massive refactoring of of the core....
r2245 # Recursively merge common sub Configs
MinRK
make Config.merge a public method...
r10873 self[k].merge(v)
Brian Granger
Massive refactoring of of the core....
r2245 else:
# Plain updates for non-Configs
MinRK
copy values in Config.merge
r13471 to_update[k] = copy.deepcopy(v)
Brian Granger
Massive refactoring of of the core....
r2245
self.update(to_update)
Thomas Kluyver
Tidy up dictionary-style methods of Config (2to3 converts 'has_key' calls to use the 'in' operator, which will be that of the parent dict unless we define it).
r3113 def __contains__(self, key):
MinRK
quotes around "Section.key"
r12928 # allow nested contains of the form `"Section.key" in config`
MinRK
add LazyConfigValue...
r12795 if '.' in key:
first, remainder = key.split('.', 1)
if first not in self:
return False
return remainder in self[first]
MinRK
don't report that undefined sections are present
r13469 return super(Config, self).__contains__(key)
Thomas Kluyver
Tidy up dictionary-style methods of Config (2to3 converts 'has_key' calls to use the 'in' operator, which will be that of the parent dict unless we define it).
r3113 # .has_key is deprecated for dictionaries.
has_key = __contains__
MinRK
don't report that undefined sections are present
r13469
Brian Granger
Massive refactoring of of the core....
r2245 def _has_section(self, key):
MinRK
don't report that undefined sections are present
r13469 return _is_section_key(key) and key in self
MinRK
cleanup Config attributes...
r13450
Brian Granger
Massive refactoring of of the core....
r2245 def copy(self):
return type(self)(dict.copy(self))
def __copy__(self):
return self.copy()
def __deepcopy__(self, memo):
import copy
Thomas Kluyver
Miscellaneous Python 3 fixes
r13364 return type(self)(copy.deepcopy(list(self.items())))
MinRK
add LazyConfigValue...
r12795
Brian Granger
Massive refactoring of of the core....
r2245 def __getitem__(self, key):
MinRK
reorder branches in Config.__getitem__...
r13468 try:
return dict.__getitem__(self, key)
except KeyError:
if _is_section_key(key):
Brian Granger
Massive refactoring of of the core....
r2245 c = Config()
dict.__setitem__(self, key, c)
return c
MinRK
reorder branches in Config.__getitem__...
r13468 else:
MinRK
don't create LazyConfigValue on `__` config names...
r13449 # undefined, create lazy value, used for container methods
MinRK
add LazyConfigValue...
r12795 v = LazyConfigValue()
dict.__setitem__(self, key, v)
return v
Brian Granger
Massive refactoring of of the core....
r2245
def __setitem__(self, key, value):
MinRK
cleanup Config attributes...
r13450 if _is_section_key(key):
Brian Granger
Massive refactoring of of the core....
r2245 if not isinstance(value, Config):
raise ValueError('values whose keys begin with an uppercase '
'char must be Config instances: %r, %r' % (key, value))
MinRK
cleanup Config attributes...
r13450 dict.__setitem__(self, key, value)
Brian Granger
Massive refactoring of of the core....
r2245
def __getattr__(self, key):
MinRK
cleanup Config attributes...
r13450 if key.startswith('__'):
return dict.__getattr__(self, key)
Brian Granger
Massive refactoring of of the core....
r2245 try:
return self.__getitem__(key)
Matthias BUSSONNIER
conform to pep 3110...
r7787 except KeyError as e:
Brian Granger
Massive refactoring of of the core....
r2245 raise AttributeError(e)
def __setattr__(self, key, value):
MinRK
cleanup Config attributes...
r13450 if key.startswith('__'):
return dict.__setattr__(self, key, value)
Brian Granger
Massive refactoring of of the core....
r2245 try:
self.__setitem__(key, value)
Matthias BUSSONNIER
conform to pep 3110...
r7787 except KeyError as e:
Brian Granger
Massive refactoring of of the core....
r2245 raise AttributeError(e)
def __delattr__(self, key):
MinRK
cleanup Config attributes...
r13450 if key.startswith('__'):
return dict.__delattr__(self, key)
Brian Granger
Massive refactoring of of the core....
r2245 try:
dict.__delitem__(self, key)
Matthias BUSSONNIER
conform to pep 3110...
r7787 except KeyError as e:
Brian Granger
Massive refactoring of of the core....
r2245 raise AttributeError(e)
#-----------------------------------------------------------------------------
# Config loading classes
#-----------------------------------------------------------------------------
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 class ConfigLoader(object):
"""A object for loading configurations from just about anywhere.
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
polish pass
r13870 The resulting configuration is packaged as a :class:`Config`.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 Notes
-----
Bernardo B. Marques
remove all trailling spaces
r4872 A :class:`ConfigLoader` does one thing: load a config from a source
MinRK
polish pass
r13870 (file, command line arguments) and returns the data as a :class:`Config` object.
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 There are lots of things that :class:`ConfigLoader` does not do. It does
not implement complex logic for finding config files. It does not handle
Bernardo B. Marques
remove all trailling spaces
r4872 default values or merge multiple configs. These things need to be
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 handled elsewhere.
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """
Matthias BUSSONNIER
allow to load config from json file...
r13771 def _log_default(self):
from IPython.config.application import Application
return Application.instance().log
def __init__(self, log=None):
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """A base class for config loaders.
Bernardo B. Marques
remove all trailling spaces
r4872
Matthias BUSSONNIER
allow to load config from json file...
r13771 log : instance of :class:`logging.Logger` to use.
By default loger of :meth:`IPython.config.application.Application.instance()`
will be used
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 Examples
--------
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 >>> cl = ConfigLoader()
>>> config = cl.load_config()
>>> config
{}
"""
self.clear()
MinRK
polish pass
r13870 if log is None:
Matthias BUSSONNIER
allow to load config from json file...
r13771 self.log = self._log_default()
self.log.debug('Using default logger')
MinRK
polish pass
r13870 else:
Matthias BUSSONNIER
allow to load config from json file...
r13771 self.log = log
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
def clear(self):
Brian Granger
Massive refactoring of of the core....
r2245 self.config = Config()
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
def load_config(self):
Brian Granger
Work on the config system....
r2500 """Load a config from somewhere, return a :class:`Config` instance.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 Usually, this will cause self.config to be set and then returned.
Brian Granger
Work on the config system....
r2500 However, in most cases, :meth:`ConfigLoader.clear` should be called
to erase any previous state.
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """
Brian Granger
Work on the config system....
r2500 self.clear()
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 return self.config
class FileConfigLoader(ConfigLoader):
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 """A base class for file based configurations.
As we add more file based config loaders, the common logic should go
here.
"""
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
Matthias BUSSONNIER
allow to load config from json file...
r13771 def __init__(self, filename, path=None, **kw):
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """Build a config loader for a filename and path.
Parameters
----------
filename : str
The file name of the config file.
path : str, list, tuple
The path to search for the config file on, or a sequence of
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 paths to try in order.
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """
Matthias BUSSONNIER
allow to load config from json file...
r13771 super(FileConfigLoader, self).__init__(**kw)
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 self.filename = filename
self.path = path
self.full_filename = ''
Matthias BUSSONNIER
allow to load config from json file...
r13771
def _find_file(self):
"""Try to find the file by searching the paths."""
self.full_filename = filefind(self.filename, self.path)
class JSONFileConfigLoader(FileConfigLoader):
"""A Json file loader for config"""
def load_config(self):
MinRK
polish pass
r13870 """Load the config from a file and return it as a Config object."""
Matthias BUSSONNIER
allow to load config from json file...
r13771 self.clear()
try:
self._find_file()
except IOError as e:
raise ConfigFileNotFound(str(e))
dct = self._read_file_as_dict()
self.config = self._convert_to_config(dct)
return self.config
def _read_file_as_dict(self):
MinRK
polish pass
r13870 with open(self.full_filename) as f:
Matthias BUSSONNIER
allow to load config from json file...
r13771 return json.load(f)
def _convert_to_config(self, dictionary):
if 'version' in dictionary:
version = dictionary.pop('version')
MinRK
polish pass
r13870 else:
Matthias BUSSONNIER
allow to load config from json file...
r13771 version = 1
MinRK
polish pass
r13870 self.log.warn("Unrecognized JSON config file version, assuming version {}".format(version))
Matthias BUSSONNIER
allow to load config from json file...
r13771
if version == 1:
return Config(dictionary)
MinRK
polish pass
r13870 else:
raise ValueError('Unknown version of JSON config file: {version}'.format(version=version))
Matthias BUSSONNIER
allow to load config from json file...
r13771
class PyFileConfigLoader(FileConfigLoader):
"""A config loader for pure python files.
This is responsible for locating a Python config file by filename and
MinRK
polish pass
r13870 path, then executing it to construct a Config object.
Matthias BUSSONNIER
allow to load config from json file...
r13771 """
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 def load_config(self):
MinRK
polish pass
r13870 """Load the config from a file and return it as a Config object."""
Brian Granger
Work on the config system....
r2500 self.clear()
MinRK
avoid interpreting IOError in config file as file-not-found...
r4905 try:
self._find_file()
except IOError as e:
raise ConfigFileNotFound(str(e))
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 self._read_file_as_dict()
return self.config
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185
def _read_file_as_dict(self):
Brian Granger
Config system is finished!...
r2258 """Load the config file into self.config, with recursive loading."""
# This closure is made available in the namespace that is used
MinRK
load_subconfig supports profiles...
r4030 # to exec the config file. It allows users to call
Brian Granger
Config system is finished!...
r2258 # load_subconfig('myconfig.py') to load config files recursively.
# It needs to be a closure because it has references to self.path
# and self.config. The sub-config is loaded with the same path
# as the parent, but it uses an empty config which is then merged
# with the parents.
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
load_subconfig supports profiles...
r4030 # If a profile is specified, the config file will be loaded
# from that profile
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
load_subconfig supports profiles...
r4030 def load_subconfig(fname, profile=None):
# import here to prevent circular imports
from IPython.core.profiledir import ProfileDir, ProfileDirError
if profile is not None:
try:
profile_dir = ProfileDir.find_profile_dir_by_name(
get_ipython_dir(),
profile,
)
except ProfileDirError:
return
path = profile_dir.location
else:
path = self.path
loader = PyFileConfigLoader(fname, path)
Brian Granger
Fixing two bugs in the handling of paths and profiles....
r2325 try:
sub_config = loader.load_config()
MinRK
avoid interpreting IOError in config file as file-not-found...
r4905 except ConfigFileNotFound:
Brian Granger
Fixing two bugs in the handling of paths and profiles....
r2325 # Pass silently if the sub config is not there. This happens
MinRK
load_subconfig supports profiles...
r4030 # when a user s using a profile, but not the default config.
Brian Granger
Fixing two bugs in the handling of paths and profiles....
r2325 pass
else:
MinRK
make Config.merge a public method...
r10873 self.config.merge(sub_config)
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Changed how config files are loaded....
r2261 # Again, this needs to be a closure and should be used in config
# files to get the config being loaded.
def get_config():
return self.config
MinRK
define `__file__` in config files
r10646 namespace = dict(
load_subconfig=load_subconfig,
get_config=get_config,
__file__=self.full_filename,
)
Thomas Kluyver
Tweak code with suggestions from yesterday.
r3458 fs_encoding = sys.getfilesystemencoding() or 'ascii'
conf_filename = self.full_filename.encode(fs_encoding)
Thomas Kluyver
Start using py3compat module.
r4731 py3compat.execfile(conf_filename, namespace)
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
class CommandLineConfigLoader(ConfigLoader):
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 """A config loader for command line arguments.
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 As we add more command line based loaders, the common logic should go
here.
"""
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
MinRK
use argparse to parse aliases & flags
r4471 def _exec_config_str(self, lhs, rhs):
MinRK
use eval for command-line args instead of exec...
r6757 """execute self.config.<lhs> = <rhs>
MinRK
expand '~' with path.expanduser in KVLoader...
r5189
* expands ~ with expanduser
MinRK
use eval for command-line args instead of exec...
r6757 * tries to assign with raw eval, otherwise assigns with just the string,
MinRK
expand '~' with path.expanduser in KVLoader...
r5189 allowing `--C.a=foobar` and `--C.a="foobar"` to be equivalent. *Not*
equivalent are `--C.a=4` and `--C.a='4'`.
"""
rhs = os.path.expanduser(rhs)
MinRK
use argparse to parse aliases & flags
r4471 try:
# Try to see if regular Python syntax will work. This
# won't handle strings as the quote marks are removed
# by the system shell.
MinRK
use eval for command-line args instead of exec...
r6757 value = eval(rhs)
MinRK
use argparse to parse aliases & flags
r4471 except (NameError, SyntaxError):
MinRK
use eval for command-line args instead of exec...
r6757 # This case happens if the rhs is a string.
value = rhs
Thomas Kluyver
Fix exec statements for Py 3...
r13350 exec(u'self.config.%s = value' % lhs)
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
use argparse to parse aliases & flags
r4471 def _load_flag(self, cfg):
"""update self.config from a flag, which can be a dict or Config"""
if isinstance(cfg, (dict, Config)):
# don't clobber whole config sections, update
# each section from config:
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for sec,c in iteritems(cfg):
MinRK
use argparse to parse aliases & flags
r4471 self.config[sec].update(c)
else:
MinRK
small changes in response to pyflakes pass...
r6270 raise TypeError("Invalid flag: %r" % cfg)
MinRK
use argparse to parse aliases & flags
r4471
MinRK
aliases match flag pattern ('-' as wordsep, not '_')...
r4214 # raw --identifier=value pattern
# but *also* accept '-' as wordsep, for aliases
# accepts: --foo=a
# --Class.trait=value
# --alias-name=value
# rejects: -foo=value
# --foo
# --Class.trait
kv_pattern = re.compile(r'\-\-[A-Za-z][\w\-]*(\.[\w\-]+)*\=.*')
# just flags, no assignments, with two *or one* leading '-'
# accepts: --foo
# -foo-bar-again
# rejects: --anything=anything
# --two.word
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 flag_pattern = re.compile(r'\-\-?\w+[\-\w]*$')
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 class KeyValueConfigLoader(CommandLineConfigLoader):
"""A config loader that loads key value pairs from the command line.
This allows command line options to be gives in the following form::
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 ipython --profile="foo" --InteractiveShell.autocall=False
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 """
Matthias BUSSONNIER
allow to load config from json file...
r13771 def __init__(self, argv=None, aliases=None, flags=None, **kw):
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 """Create a key value pair config loader.
Parameters
----------
argv : list
A list that has the form of sys.argv[1:] which has unicode
elements of the form u"key=value". If this is None (default),
then sys.argv[1:] will be used.
MinRK
rename macros/shortnames to flags/aliases...
r3861 aliases : dict
MinRK
move shortname to Application...
r3852 A dict of aliases for configurable traits.
Keys are the short aliases, Values are the resolved trait.
MinRK
rename macros/shortnames to flags/aliases...
r3861 Of the form: `{'alias' : 'Configurable.trait'}`
flags : dict
A dict of flags, keyed by str name. Vaues can be Config objects,
dicts, or "key=value" strings. If Config or dict, when the flag
is triggered, The flag is loaded as `self.config.update(m)`.
Brian Granger
Added KeyValueConfigLoader with tests.
r3786
Returns
-------
config : Config
The resulting Config object.
Examples
--------
>>> from IPython.config.loader import KeyValueConfigLoader
>>> cl = KeyValueConfigLoader()
Thomas Kluyver
Fix tests relying on dict order in IPython.config
r7015 >>> d = cl.load_config(["--A.name='brian'","--B.number=0"])
>>> sorted(d.items())
[('A', {'name': 'brian'}), ('B', {'number': 0})]
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 """
Matthias BUSSONNIER
allow to load config from json file...
r13771 super(KeyValueConfigLoader, self).__init__(**kw)
Brian Granger
Ongoing work on the config system....
r3789 if argv is None:
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 argv = sys.argv[1:]
self.argv = argv
MinRK
rename macros/shortnames to flags/aliases...
r3861 self.aliases = aliases or {}
self.flags = flags or {}
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
code updates per review of PR #454
r4021 def clear(self):
super(KeyValueConfigLoader, self).clear()
self.extra_args = []
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
fix handling of unicode in KV loader...
r4162 def _decode_argv(self, argv, enc=None):
"""decode argv if bytes, using stin.encoding, falling back on default enc"""
uargv = []
if enc is None:
Brandon Parsons
saner default encoding mechanism
r6716 enc = DEFAULT_ENCODING
MinRK
fix handling of unicode in KV loader...
r4162 for arg in argv:
Thomas Kluyver
Replace references to unicode and basestring
r13353 if not isinstance(arg, unicode_type):
MinRK
fix handling of unicode in KV loader...
r4162 # only decode if not already decoded
arg = arg.decode(enc)
uargv.append(arg)
return uargv
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
rename macros/shortnames to flags/aliases...
r3861 def load_config(self, argv=None, aliases=None, flags=None):
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 """Parse the configuration and generate the Config object.
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
code updates per review of PR #454
r4021 After loading, any arguments that are not key-value or
flags will be stored in self.extra_args - a list of
unparsed command-line arguments. This is used for
arguments such as input files or subcommands.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 Parameters
----------
argv : list, optional
A list that has the form of sys.argv[1:] which has unicode
elements of the form u"key=value". If this is None (default),
Brian Granger
Ongoing work on the config system....
r3789 then self.argv will be used.
MinRK
rename macros/shortnames to flags/aliases...
r3861 aliases : dict
MinRK
move shortname to Application...
r3852 A dict of aliases for configurable traits.
Keys are the short aliases, Values are the resolved trait.
MinRK
rename macros/shortnames to flags/aliases...
r3861 Of the form: `{'alias' : 'Configurable.trait'}`
flags : dict
A dict of flags, keyed by str name. Values can be Config objects
Bernardo B. Marques
remove all trailling spaces
r4872 or dicts. When the flag is triggered, The config is loaded as
MinRK
rename macros/shortnames to flags/aliases...
r3861 `self.config.update(cfg)`.
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 """
self.clear()
if argv is None:
argv = self.argv
MinRK
rename macros/shortnames to flags/aliases...
r3861 if aliases is None:
aliases = self.aliases
if flags is None:
flags = self.flags
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
parse cl_args agnostic of leading '-'...
r4189 # ensure argv is a list of unicode strings:
uargv = self._decode_argv(argv)
for idx,raw in enumerate(uargv):
# strip leading '-'
item = raw.lstrip('-')
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
parse cl_args agnostic of leading '-'...
r4189 if raw == '--':
# don't parse arguments after '--'
MinRK
don't stop parsing on unrecognized args...
r4211 # this is useful for relaying arguments to scripts, e.g.
Matthias BUSSONNIER
remove some other occurences of pylab
r11783 # ipython -i foo.py --matplotlib=qt -- args after '--' go-to-foo.py
MinRK
parse cl_args agnostic of leading '-'...
r4189 self.extra_args.extend(uargv[idx+1:])
break
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 if kv_pattern.match(raw):
MinRK
move shortname to Application...
r3852 lhs,rhs = item.split('=',1)
MinRK
rename macros/shortnames to flags/aliases...
r3861 # Substitute longnames for aliases.
if lhs in aliases:
lhs = aliases[lhs]
MinRK
aliases match flag pattern ('-' as wordsep, not '_')...
r4214 if '.' not in lhs:
# probably a mistyped alias, but not technically illegal
MinRK
polish pass
r13870 self.log.warn("Unrecognized alias: '%s', it will probably have no effect.", raw)
MinRK
Don't let invalid aliases crash IPython...
r5190 try:
self._exec_config_str(lhs, rhs)
except Exception:
raise ArgumentError("Invalid argument: '%s'" % raw)
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 elif flag_pattern.match(raw):
if item in flags:
cfg,help = flags[item]
MinRK
use argparse to parse aliases & flags
r4471 self._load_flag(cfg)
MinRK
move shortname to Application...
r3852 else:
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 raise ArgumentError("Unrecognized flag: '%s'"%raw)
MinRK
parse cl_args agnostic of leading '-'...
r4189 elif raw.startswith('-'):
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 kv = '--'+item
if kv_pattern.match(kv):
raise ArgumentError("Invalid argument: '%s', did you mean '%s'?"%(raw, kv))
else:
raise ArgumentError("Invalid argument: '%s'"%raw)
MinRK
allow extra_args in applications
r3958 else:
Bernardo B. Marques
remove all trailling spaces
r4872 # keep all args that aren't valid in a list,
MinRK
allow extra_args in applications
r3958 # in case our parent knows what to do with them.
MinRK
don't stop parsing on unrecognized args...
r4211 self.extra_args.append(item)
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 return self.config
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 class ArgParseConfigLoader(CommandLineConfigLoader):
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 """A loader that uses the argparse module to load from the command line."""
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185
Matthias BUSSONNIER
allow to load config from json file...
r13771 def __init__(self, argv=None, aliases=None, flags=None, log=None, *parser_args, **parser_kw):
Brian Granger
Work on the config system....
r2500 """Create a config loader for use with argparse.
Fernando Perez
Manage and propagate argv correctly....
r2391
Parameters
----------
argv : optional, list
If given, used to read command-line arguments from, otherwise
sys.argv[1:] is used.
Fernando Perez
Move crash handling to the application level and simplify class structure....
r2403
Brian Granger
Work on the config system....
r2500 parser_args : tuple
A tuple of positional arguments that will be passed to the
constructor of :class:`argparse.ArgumentParser`.
parser_kw : dict
A tuple of keyword arguments that will be passed to the
constructor of :class:`argparse.ArgumentParser`.
Brian Granger
Added KeyValueConfigLoader with tests.
r3786
Returns
-------
config : Config
The resulting Config object.
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """
Matthias BUSSONNIER
allow to load config from json file...
r13771 super(CommandLineConfigLoader, self).__init__(log=log)
MinRK
use argparse to parse aliases & flags
r4471 self.clear()
if argv is None:
Fernando Perez
Manage and propagate argv correctly....
r2391 argv = sys.argv[1:]
self.argv = argv
MinRK
use argparse to parse aliases & flags
r4471 self.aliases = aliases or {}
self.flags = flags or {}
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Work on the config system....
r2500 self.parser_args = parser_args
Thomas Kluyver
Fix DeprecationWarning with system-wide argparse.
r3440 self.version = parser_kw.pop("version", None)
Brian Granger
Work on the config system....
r2500 kwargs = dict(argument_default=argparse.SUPPRESS)
kwargs.update(parser_kw)
self.parser_kw = kwargs
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
MinRK
use argparse to parse aliases & flags
r4471 def load_config(self, argv=None, aliases=None, flags=None):
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 """Parse command line arguments and return as a Config object.
Fernando Perez
Manage and propagate argv correctly....
r2391
Parameters
----------
args : optional, list
Brian Granger
Work on the config system....
r2500 If given, a list with the structure of sys.argv[1:] to parse
arguments from. If not given, the instance's self.argv attribute
(given at construction time) is used."""
self.clear()
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 if argv is None:
argv = self.argv
MinRK
use argparse to parse aliases & flags
r4471 if aliases is None:
aliases = self.aliases
if flags is None:
flags = self.flags
self._create_parser(aliases, flags)
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 self._parse_args(argv)
Brian Granger
Massive refactoring of of the core....
r2245 self._convert_to_config()
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 return self.config
Brian Granger
All code startup related things are working....
r2253 def get_extra_args(self):
if hasattr(self, 'extra_args'):
return self.extra_args
else:
return []
MinRK
use argparse to parse aliases & flags
r4471 def _create_parser(self, aliases=None, flags=None):
Brian Granger
Work on the config system....
r2500 self.parser = ArgumentParser(*self.parser_args, **self.parser_kw)
MinRK
use argparse to parse aliases & flags
r4471 self._add_arguments(aliases, flags)
Brian Granger
Semi-final Application and minor work on traitlets.
r2200
MinRK
use argparse to parse aliases & flags
r4471 def _add_arguments(self, aliases=None, flags=None):
Brian Granger
Refactored the command line config system and other aspects of config....
r2501 raise NotImplementedError("subclasses must implement _add_arguments")
Fernando Perez
Simplify options handling code by using argparse argument_default....
r2428
Fernando Perez
Manage and propagate argv correctly....
r2391 def _parse_args(self, args):
Thomas Kluyver
Handle errors from older versions of argparse.
r3457 """self.parser->self.parsed_data"""
MinRK
fix at least some command-line unicode options
r3464 # decode sys.argv to support unicode command-line options
Brandon Parsons
saner default encoding mechanism
r6716 enc = DEFAULT_ENCODING
MinRK
add text.getdefaultencoding() for central default encoding guess...
r4783 uargs = [py3compat.cast_unicode(a, enc) for a in args]
MinRK
fix at least some command-line unicode options
r3464 self.parsed_data, self.extra_args = self.parser.parse_known_args(uargs)
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185
Brian Granger
Massive refactoring of of the core....
r2245 def _convert_to_config(self):
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 """self.parsed_data->self.config"""
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for k, v in iteritems(vars(self.parsed_data)):
Thomas Kluyver
Fix exec statements for Py 3...
r13350 exec("self.config.%s = v"%k, locals(), globals())
MinRK
use argparse to parse aliases & flags
r4471
class KVArgParseConfigLoader(ArgParseConfigLoader):
"""A config loader that loads aliases and flags with argparse,
Bernardo B. Marques
remove all trailling spaces
r4872 but will use KVLoader for the rest. This allows better parsing
MinRK
use argparse to parse aliases & flags
r4471 of common args, such as `ipython -c 'print 5'`, but still gets
arbitrary config with `ipython --InteractiveShell.use_readline=False`"""
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
use argparse to parse aliases & flags
r4471 def _add_arguments(self, aliases=None, flags=None):
self.alias_flags = {}
# print aliases, flags
if aliases is None:
aliases = self.aliases
if flags is None:
flags = self.flags
paa = self.parser.add_argument
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for key,value in iteritems(aliases):
MinRK
use argparse to parse aliases & flags
r4471 if key in flags:
# flags
nargs = '?'
else:
nargs = None
if len(key) is 1:
Thomas Kluyver
Replace references to unicode and basestring
r13353 paa('-'+key, '--'+key, type=unicode_type, dest=value, nargs=nargs)
MinRK
use argparse to parse aliases & flags
r4471 else:
Thomas Kluyver
Replace references to unicode and basestring
r13353 paa('--'+key, type=unicode_type, dest=value, nargs=nargs)
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for key, (value, help) in iteritems(flags):
MinRK
use argparse to parse aliases & flags
r4471 if key in self.aliases:
Bernardo B. Marques
remove all trailling spaces
r4872 #
MinRK
use argparse to parse aliases & flags
r4471 self.alias_flags[self.aliases[key]] = value
continue
if len(key) is 1:
paa('-'+key, '--'+key, action='append_const', dest='_flags', const=value)
else:
paa('--'+key, action='append_const', dest='_flags', const=value)
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
use argparse to parse aliases & flags
r4471 def _convert_to_config(self):
"""self.parsed_data->self.config, parse unrecognized extra args via KVLoader."""
# remove subconfigs list from namespace before transforming the Namespace
if '_flags' in self.parsed_data:
subcs = self.parsed_data._flags
del self.parsed_data._flags
else:
subcs = []
Bernardo B. Marques
remove all trailling spaces
r4872
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for k, v in iteritems(vars(self.parsed_data)):
MinRK
use argparse to parse aliases & flags
r4471 if v is None:
# it was a flag that shares the name of an alias
subcs.append(self.alias_flags[k])
else:
# eval the KV assignment
self._exec_config_str(k, v)
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
use argparse to parse aliases & flags
r4471 for subc in subcs:
MinRK
use cfg._merge instead of update in loader...
r4606 self._load_flag(subc)
Bernardo B. Marques
remove all trailling spaces
r4872
MinRK
use argparse to parse aliases & flags
r4471 if self.extra_args:
Matthias BUSSONNIER
allow to load config from json file...
r13771 sub_parser = KeyValueConfigLoader(log=self.log)
MinRK
use argparse to parse aliases & flags
r4471 sub_parser.load_config(self.extra_args)
MinRK
make Config.merge a public method...
r10873 self.config.merge(sub_parser.config)
MinRK
use argparse to parse aliases & flags
r4471 self.extra_args = sub_parser.extra_args
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199
def load_pyconfig_files(config_files, path):
"""Load multiple Python config files, merging each of them in turn.
Parameters
==========
config_files : list of str
List of config files names to load and merge into the config.
path : unicode
The full path to the location of the config files.
"""
config = Config()
for cf in config_files:
loader = PyFileConfigLoader(cf, path=path)
try:
next_config = loader.load_config()
except ConfigFileNotFound:
pass
except:
raise
else:
MinRK
make Config.merge a public method...
r10873 config.merge(next_config)
Brian Granger
Notebook cluster manager now uses proper launchers.
r6199 return config