diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 21:06:46 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 21:06:46 +0000 |
| commit | d070cc5350178e0ddbd429763b5754c7718a2f70 (patch) | |
| tree | 3ec6e413065e8f0c9d29074576cc02aa1e72852e /Lib/ConfigParser.py | |
| parent | f0881ab1fe819dfb833daf7eafc6d488f3d4706a (diff) | |
| download | cpython-git-d070cc5350178e0ddbd429763b5754c7718a2f70.tar.gz | |
Merged revisions 83226-83227,83229-83230,83232 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83226 | georg.brandl | 2010-07-29 16:17:12 +0200 (Do, 29 Jul 2010) | 1 line
#1090076: explain the behavior of *vars* in get() better.
........
r83227 | georg.brandl | 2010-07-29 16:23:06 +0200 (Do, 29 Jul 2010) | 1 line
Use Py_CLEAR().
........
r83229 | georg.brandl | 2010-07-29 16:32:22 +0200 (Do, 29 Jul 2010) | 1 line
#9407: document configparser.Error.
........
r83230 | georg.brandl | 2010-07-29 16:36:11 +0200 (Do, 29 Jul 2010) | 1 line
Use correct directive and name.
........
r83232 | georg.brandl | 2010-07-29 16:49:08 +0200 (Do, 29 Jul 2010) | 1 line
#9388: remove ERA_YEAR which is never defined in the source code.
........
Diffstat (limited to 'Lib/ConfigParser.py')
| -rw-r--r-- | Lib/ConfigParser.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/ConfigParser.py b/Lib/ConfigParser.py index 3f041c734f..3e2175f049 100644 --- a/Lib/ConfigParser.py +++ b/Lib/ConfigParser.py @@ -550,11 +550,12 @@ class ConfigParser(RawConfigParser): def get(self, section, option, raw=False, vars=None): """Get an option value for a given section. - All % interpolations are expanded in the return values, based on the - defaults passed into the constructor, unless the optional argument - `raw' is true. Additional substitutions may be provided using the - `vars' argument, which must be a dictionary whose contents overrides - any pre-existing defaults. + If `vars' is provided, it must be a dictionary. The option is looked up + in `vars' (if provided), `section', and in `defaults' in that order. + + All % interpolations are expanded in the return values, unless the + optional argument `raw' is true. Values for interpolation keys are + looked up in the same manner as the option. The section DEFAULT is special. """ |