Skip to content

Commit

Permalink
Merge pull request PyCQA#90 from iElectric/master
Browse files Browse the repository at this point in the history
Clarify .pep8 can be located in any parent folder
  • Loading branch information
florentx committed Jun 26, 2012
2 parents f06d3da + a10ee29 commit ab7f4c8
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pep8.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)")
Expand Down

0 comments on commit ab7f4c8

Please sign in to comment.