diff options
author | Ian Lee <IanLee1521@gmail.com> | 2015-02-05 22:58:10 -0800 |
---|---|---|
committer | Ian Lee <IanLee1521@gmail.com> | 2015-02-05 22:58:10 -0800 |
commit | 9e396b064011a02c05587d609270a193f3e9beb9 (patch) | |
tree | 20ee9d4b8beb71425504b845d51726f592c37605 | |
parent | ed1e25cc274926e07fc0e3859df8980814a98b2f (diff) | |
download | pep8-9e396b064011a02c05587d609270a193f3e9beb9.tar.gz |
Update configuration documentation; issue #368 / #369
-rwxr-xr-x | pep8.py | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -1925,7 +1925,15 @@ def get_parser(prog='pep8', version=__version__): def read_config(options, args, arglist, parser): - """Read both user configuration and local configuration.""" + """Read and parse configurations + + If a config file is specified on the command line with the "--config" + option, then only it is used for configuration. + + Otherwise, the user configuration (~/.config/pep8) and any local + configurations in the current directory or above will be merged together + (in that order) using the read method of ConfigParser. + """ config = RawConfigParser() cli_conf = options.config |