##// END OF EJS Templates
finish plumbing config to Session objects...
finish plumbing config to Session objects This means that the qtconsole now has full access to HMAC message digests and non-JSON serialization (pickle, msgpack, etc.).

File last commit:

r3960:dd553fc4
r4015:82222c30
Show More
loader.py
513 lines | 17.6 KiB | text/x-python | PythonLexer
Brian Granger
Massive refactoring of of the core....
r2245 """A simple configuration system.
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
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """
#-----------------------------------------------------------------------------
# Copyright (C) 2008-2009 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Brian Granger
Massive refactoring of of the core....
r2245 import __builtin__
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
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 from IPython.external import argparse
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 from IPython.utils.path import filefind
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
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."""
def print_help(self, file=None):
if file is None:
file = sys.stdout
return super(ArgumentParser, self).print_help(file)
print_help.__doc__ = argparse.ArgumentParser.print_help.__doc__
Brian Granger
Massive refactoring of of the core....
r2245 #-----------------------------------------------------------------------------
# Config class for holding config information
#-----------------------------------------------------------------------------
class Config(dict):
"""An attribute based dict that can do smart merges."""
def __init__(self, *args, **kwds):
dict.__init__(self, *args, **kwds)
# This sets self.__dict__ = self, but it has to be done this way
# because we are also overriding __setattr__.
dict.__setattr__(self, '__dict__', self)
def _merge(self, other):
to_update = {}
Thomas Kluyver
Replacing some .items() calls with .iteritems() for cleaner conversion with 2to3.
r3114 for k, v in other.iteritems():
Brian Granger
Massive refactoring of of the core....
r2245 if not self.has_key(k):
to_update[k] = v
else: # I have this key
if isinstance(v, Config):
# Recursively merge common sub Configs
self[k]._merge(v)
else:
# Plain updates for non-Configs
to_update[k] = v
self.update(to_update)
def _is_section_key(self, key):
if key[0].upper()==key[0] and not key.startswith('_'):
return True
else:
return False
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):
Brian Granger
Massive refactoring of of the core....
r2245 if self._is_section_key(key):
return True
else:
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 return super(Config, self).__contains__(key)
# .has_key is deprecated for dictionaries.
has_key = __contains__
Brian Granger
Massive refactoring of of the core....
r2245
def _has_section(self, key):
if self._is_section_key(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 if super(Config, self).__contains__(key):
Brian Granger
Massive refactoring of of the core....
r2245 return True
return False
def copy(self):
return type(self)(dict.copy(self))
def __copy__(self):
return self.copy()
def __deepcopy__(self, memo):
import copy
return type(self)(copy.deepcopy(self.items()))
def __getitem__(self, key):
Antonio Cuni <antocuni>
Tweak config loader for PyPy compatibility....
r3497 # We cannot use directly self._is_section_key, because it triggers
# infinite recursion on top of PyPy. Instead, we manually fish the
# bound method.
is_section_key = self.__class__._is_section_key.__get__(self)
Brian Granger
Massive refactoring of of the core....
r2245 # Because we use this for an exec namespace, we need to delegate
# the lookup of names in __builtin__ to itself. This means
# that you can't have section or attribute names that are
# builtins.
try:
return getattr(__builtin__, key)
except AttributeError:
pass
Antonio Cuni <antocuni>
Tweak config loader for PyPy compatibility....
r3497 if is_section_key(key):
Brian Granger
Massive refactoring of of the core....
r2245 try:
return dict.__getitem__(self, key)
except KeyError:
c = Config()
dict.__setitem__(self, key, c)
return c
else:
return dict.__getitem__(self, key)
def __setitem__(self, key, value):
# Don't allow names in __builtin__ to be modified.
if hasattr(__builtin__, key):
raise ConfigError('Config variable names cannot have the same name '
'as a Python builtin: %s' % key)
if self._is_section_key(key):
if not isinstance(value, Config):
raise ValueError('values whose keys begin with an uppercase '
'char must be Config instances: %r, %r' % (key, value))
else:
dict.__setitem__(self, key, value)
def __getattr__(self, key):
try:
return self.__getitem__(key)
except KeyError, e:
raise AttributeError(e)
def __setattr__(self, key, value):
try:
self.__setitem__(key, value)
except KeyError, e:
raise AttributeError(e)
def __delattr__(self, key):
try:
dict.__delitem__(self, key)
except KeyError, e:
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.
The resulting configuration is packaged as a :class:`Struct`.
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185
Notes
-----
A :class:`ConfigLoader` does one thing: load a config from a source
(file, command line arguments) and returns the data as a :class:`Struct`.
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
default values or merge multiple configs. These things need to be
handled elsewhere.
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """
def __init__(self):
"""A base class for config loaders.
Examples
--------
>>> cl = ConfigLoader()
>>> config = cl.load_config()
>>> config
{}
"""
self.clear()
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.
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.
"""
pass
class PyFileConfigLoader(FileConfigLoader):
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 """A config loader for pure python files.
This calls execfile on a plain python file and looks for attributes
that are all caps. These attribute are added to the config Struct.
"""
Brian Granger
Semi-final Application and minor work on traitlets.
r2200 def __init__(self, filename, path=None):
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 """
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 super(PyFileConfigLoader, self).__init__()
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 self.filename = filename
self.path = path
self.full_filename = ''
self.data = None
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 def load_config(self):
"""Load the config from a file and return it as a Struct."""
Brian Granger
Work on the config system....
r2500 self.clear()
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 self._find_file()
self._read_file_as_dict()
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
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 _find_file(self):
"""Try to find the file by searching the paths."""
Brian Granger
Semi-final Application and minor work on traitlets.
r2200 self.full_filename = filefind(self.filename, self.path)
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
# to exec the config file. This allows users to call
# 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.
def load_subconfig(fname):
loader = PyFileConfigLoader(fname, self.path)
Brian Granger
Fixing two bugs in the handling of paths and profiles....
r2325 try:
sub_config = loader.load_config()
except IOError:
# Pass silently if the sub config is not there. This happens
# when a user us using a profile, but not the default config.
pass
else:
self.config._merge(sub_config)
Brian Granger
Config system is finished!...
r2258
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
namespace = dict(load_subconfig=load_subconfig, get_config=get_config)
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
Fix for non-ascii characters in IPYTHONDIR, + unit test.
r3452 execfile(conf_filename, namespace)
Brian Granger
First prototype of component, traitlets and a config loader.
r2157
Brian Granger
Massive refactoring of of the core....
r2245 def _convert_to_config(self):
Brian Granger
First prototype of component, traitlets and a config loader.
r2157 if self.data is None:
ConfigLoaderError('self.data does not exist')
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
allow empty strings in kv_pattern...
r3960 kv_pattern = re.compile(r'[A-Za-z]\w*(\.\w+)*\=.*')
MinRK
rename macros/shortnames to flags/aliases...
r3861 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::
ipython Global.profile="foo" InteractiveShell.autocall=False
"""
MinRK
rename macros/shortnames to flags/aliases...
r3861 def __init__(self, argv=None, aliases=None, flags=None):
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()
>>> cl.load_config(["foo='bar'","A.name='brian'","B.number=0"])
{'A': {'name': 'brian'}, 'B': {'number': 0}, 'foo': 'bar'}
"""
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 {}
Brian Granger
Added KeyValueConfigLoader with tests.
r3786
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.
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
or dicts. When the flag is triggered, The config is loaded as
`self.config.update(cfg)`.
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 """
Brian Granger
Added new tests for config.loader and configurable.
r3791 from IPython.config.configurable import Configurable
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
MinRK
allow extra_args in applications
r3958
self.extra_args = []
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 for item in argv:
MinRK
move shortname to Application...
r3852 if kv_pattern.match(item):
lhs,rhs = item.split('=',1)
MinRK
rename macros/shortnames to flags/aliases...
r3861 # Substitute longnames for aliases.
if lhs in aliases:
lhs = aliases[lhs]
Brian Granger
Ongoing work on the config system....
r3789 exec_str = 'self.config.' + lhs + '=' + rhs
try:
Brian Granger
Added new tests for config.loader and configurable.
r3791 # Try to see if regular Python syntax will work. This
# won't handle strings as the quote marks are removed
# by the system shell.
Brian Granger
Ongoing work on the config system....
r3789 exec exec_str in locals(), globals()
except (NameError, SyntaxError):
Brian Granger
Added new tests for config.loader and configurable.
r3791 # This case happens if the rhs is a string but without
# the quote marks. We add the quote marks and see if
# it succeeds. If it still fails, we let it raise.
Brian Granger
Ongoing work on the config system....
r3789 exec_str = 'self.config.' + lhs + '="' + rhs + '"'
exec exec_str in locals(), globals()
MinRK
rename macros/shortnames to flags/aliases...
r3861 elif flag_pattern.match(item):
MinRK
move shortname to Application...
r3852 # trim leading '--'
m = item[2:]
MinRK
rename macros/shortnames to flags/aliases...
r3861 cfg,_ = flags.get(m, (None,None))
if cfg is None:
MinRK
print usage on invalid command-line arguments
r3951 raise ArgumentError("Unrecognized flag: %r"%item)
MinRK
rename macros/shortnames to flags/aliases...
r3861 elif isinstance(cfg, (dict, Config)):
MinRK
prevent flags from clobbering entire config sections...
r3957 # don't clobber whole config sections, update
# each section from config:
for sec,c in cfg.iteritems():
self.config[sec].update(c)
MinRK
move shortname to Application...
r3852 else:
MinRK
rename macros/shortnames to flags/aliases...
r3861 raise ValueError("Invalid flag: %r"%flag)
MinRK
allow extra_args in applications
r3958 elif item.startswith('-'):
# this shouldn't ever be valid
MinRK
print usage on invalid command-line arguments
r3951 raise ArgumentError("Invalid argument: %r"%item)
MinRK
allow extra_args in applications
r3958 else:
# keep all args that aren't valid in a list,
# in case our parent knows what to do with them.
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
Brian Granger
Refactored the command line config system and other aspects of config....
r2501 def __init__(self, argv=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 """
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 super(CommandLineConfigLoader, self).__init__()
Fernando Perez
Manage and propagate argv correctly....
r2391 if argv == None:
argv = sys.argv[1:]
self.argv = argv
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
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 def load_config(self, argv=None):
"""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
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 self._create_parser()
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 []
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 def _create_parser(self):
Brian Granger
Work on the config system....
r2500 self.parser = ArgumentParser(*self.parser_args, **self.parser_kw)
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 self._add_arguments()
Brian Granger
Semi-final Application and minor work on traitlets.
r2200
Brian Granger
Working version of the new config loaders for .py files and argparse.
r2185 def _add_arguments(self):
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
uargs = []
for a in args:
if isinstance(a, str):
# don't decode if we already got unicode
Thomas Kluyver
Modify tests to expect unicode. Now all tests pass again.
r3471 a = a.decode(sys.stdin.encoding or
sys.getdefaultencoding())
MinRK
fix at least some command-line unicode options
r3464 uargs.append(a)
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
Replacing some .items() calls with .iteritems() for cleaner conversion with 2to3.
r3114 for k, v in vars(self.parsed_data).iteritems():
Brian Granger
Work on the config system....
r2500 exec_str = 'self.config.' + k + '= v'
exec exec_str in locals(), globals()