summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2012-06-26 10:44:37 -0700
committerFlorent Xicluna <florent.xicluna@gmail.com>2012-06-26 10:44:37 -0700
commitab7f4c88126db7b5fc248f8c04171342cdafb7d9 (patch)
tree43809241587058064c14c7f5fe79c36c915aaa71
parentf06d3da01fc0b99d64cf3b72b981edd56cfa0760 (diff)
parenta10ee297e2d6d143f5e73df62f17cf73c1c85c90 (diff)
downloadpep8-ab7f4c88126db7b5fc248f8c04171342cdafb7d9.tar.gz
Merge pull request #90 from iElectric/master
Clarify .pep8 can be located in any parent folder
-rwxr-xr-xpep8.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pep8.py b/pep8.py
index 5903f27..e547589 100755
--- a/pep8.py
+++ b/pep8.py
@@ -1847,7 +1847,9 @@ def process_options(arglist=None, parse_argv=False, config_file=None):
group.add_option('--benchmark', action='store_true',
help="measure processing speed")
group = parser.add_option_group("Configuration", description=(
- "The configuration options are read from the [pep8] section. "
+ "The configuration options are read from the [pep8] section written "
+ "in .ini style config file. Config can be located in any parent "
+ "folder of file being processed. "
"Allowed options are: %s." % ', '.join(parser.config_options)))
group.add_option('--config', metavar='path', default=config_file,
help="config file location (default: %default)")