Skip to content

Commit

Permalink
Latest pycodestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
asottile committed Jan 29, 2019
1 parent 532ea9c commit 50e7cc7
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 4 deletions.
1 change: 1 addition & 0 deletions docs/source/plugin-development/plugin-parameters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ the data instead of being called on each physical or logical line.
- :attr:`~flake8.processor.FileProcessor.file_tokens`
- :attr:`~flake8.processor.FileProcessor.lines`
- :attr:`~flake8.processor.FileProcessor.max_line_length`
- :attr:`~flake8.processor.FileProcessor.max_doc_length`
- :attr:`~flake8.processor.FileProcessor.total_lines`
- :attr:`~flake8.processor.FileProcessor.verbose`

Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ requires-dist =
enum34; python_version<"3.4"
typing; python_version<"3.5"
configparser; python_version<"3.2"
pyflakes >= 2.0.0, < 2.1.0
pycodestyle >= 2.4.0, < 2.5.0
pyflakes >= 2.1.0, < 2.2.0
pycodestyle >= 2.5.0, < 2.6.0
mccabe >= 0.6.0, < 0.7.0
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
"entrypoints >= 0.2.3, < 0.3.0",
"pyflakes >= 2.1.0, < 2.2.0",
"pycodestyle >= 2.4.0, < 2.5.0",
"pycodestyle >= 2.5.0, < 2.6.0",
"mccabe >= 0.6.0, < 0.7.0",
]

Expand Down Expand Up @@ -115,6 +115,7 @@ def get_long_description():
PEP8_PLUGIN('comparison_type'),
PEP8_PLUGIN('ambiguous_identifier'),
PEP8_PLUGIN('bare_except'),
PEP8_PLUGIN('maximum_doc_length'),
PEP8_PLUGIN('python_3000_has_key'),
PEP8_PLUGIN('python_3000_raise_comma'),
PEP8_PLUGIN('python_3000_not_equal'),
Expand Down
11 changes: 11 additions & 0 deletions src/flake8/main/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def register_default_options(option_manager):
- ``--extend-ignore``
- ``--per-file-ignores``
- ``--max-line-length``
- ``--max-doc-length``
- ``--select``
- ``--disable-noqa``
- ``--show-source``
Expand Down Expand Up @@ -164,6 +165,16 @@ def register_default_options(option_manager):
"(Default: %default)",
)

add_option(
"--max-doc-length",
type="int",
metavar="n",
default=None,
parse_from_config=True,
help="Maximum allowed doc line length for the entirety of this run. "
"(Default: %default)",
)

add_option(
"--select",
metavar="errors",
Expand Down
3 changes: 3 additions & 0 deletions src/flake8/processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class FileProcessor(object):
- :attr:`line_number`
- :attr:`logical_line`
- :attr:`max_line_length`
- :attr:`max_doc_length`
- :attr:`multiline`
- :attr:`noqa`
- :attr:`previous_indent_level`
Expand Down Expand Up @@ -80,6 +81,8 @@ def __init__(self, filename, options, lines=None):
self.logical_line = ""
#: Maximum line length as configured by the user
self.max_line_length = options.max_line_length
#: Maximum docstring / comment line length as configured by the user
self.max_doc_length = options.max_doc_length
#: Whether the current physical line is multiline
self.multiline = False
#: Whether or not we're observing NoQA
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_checker_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def test_oserrors_cause_serial_fall_back():
with mock.patch('_multiprocessing.SemLock', side_effect=err):
manager = checker.Manager(style_guide, [], [])
with mock.patch.object(manager, 'run_serial') as serial:
manager.run()
manager.run()
assert serial.call_count == 1
assert manager.using_multiprocessing is False

Expand Down
1 change: 1 addition & 0 deletions tests/unit/test_file_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def options_from(**kwargs):
"""Generate a Values instances with our kwargs."""
kwargs.setdefault('hang_closing', True)
kwargs.setdefault('max_line_length', 79)
kwargs.setdefault('max_doc_length', None)
kwargs.setdefault('verbose', False)
kwargs.setdefault('stdin_display_name', 'stdin')
return optparse.Values(kwargs)
Expand Down

0 comments on commit 50e7cc7

Please sign in to comment.