diff options
author | Florent Xicluna <florent.xicluna@gmail.com> | 2012-06-26 18:23:44 +0200 |
---|---|---|
committer | Florent Xicluna <florent.xicluna@gmail.com> | 2012-06-26 18:23:44 +0200 |
commit | e2d1a987f146e000d4964f9df42aaeddd8c5489a (patch) | |
tree | 81baf3de612b662eaab05ba3950da28c712302dd | |
parent | d01bb58ddc8c406a1daf00c47106e56b33043d59 (diff) | |
download | pep8-e2d1a987f146e000d4964f9df42aaeddd8c5489a.tar.gz |
Add changelog entries for issue #86 and issue #91.
-rw-r--r-- | CHANGES.txt | 4 | ||||
-rwxr-xr-x | pep8.py | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index eb2cc32..f97f86c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,10 @@ Changelog * Set a sensible default path for config file on Windows. (Issue #95) +* Allow ``verbose`` in the configuration file. (Issue #91) + +* Show the enforced ``max-line-length`` in the error message. (Issue #86) + 1.3.1 (2012-06-18) ------------------ @@ -271,9 +271,8 @@ def maximum_line_length(physical_line, max_line_length): except UnicodeError: pass if length > max_line_length: - return max_line_length, \ - "E501 line too long (%d characters > max %d)" % \ - (length, max_line_length) + return (max_line_length, "E501 line too long " + "(%d > %d characters)" % (length, max_line_length)) ############################################################################## @@ -1799,9 +1798,8 @@ def process_options(arglist=None, parse_argv=False, config_file=None): parser = OptionParser(version=__version__, usage="%prog [options] input ...") parser.config_options = [ - 'exclude', 'filename', 'select', 'ignore', 'max-line-length', - 'count', 'format', 'quiet', 'show-pep8', 'show-source', 'statistics', - 'verbose'] + 'exclude', 'filename', 'select', 'ignore', 'max-line-length', 'count', + 'format', 'quiet', 'verbose', 'show-pep8', 'show-source', 'statistics'] parser.add_option('-v', '--verbose', default=0, action='count', help="print status messages, or debug with -vv") parser.add_option('-q', '--quiet', default=0, action='count', |