.appveyor.yml

@@ -1,8 +1,8 @@
 # To activate, change the Appveyor settings to use `.appveyor.yml`.
 install:
-  - python -m pip install --upgrade tox virtualenv
+  - python -m pip install --upgrade setuptools tox virtualenv
 
 build: off
 
 test_script:
-  - python -m tox -e py27,py34,py35,dogfood
+  - python -m tox -e py27,py36,py37,dogfood

.bandit.yml

@@ -1,84 +1,5 @@
-tests:
 skips:
+- B101  # Ignore defensive `assert`s (especially useful for mypy)
 - B404  # Ignore warnings about importing subprocess
 - B603  # Ignore warnings about calling subprocess.Popen without shell=True
 - B607  # Ignore warnings about calling subprocess.Popen without a full path to executable
-
-### (optional) plugin settings - some test plugins require configuration data
-### that may be given here, per-plugin. All bandit test plugins have a built in
-### set of sensible defaults and these will be used if no configuration is
-### provided. It is not necessary to provide settings for every (or any) plugin
-### if the defaults are acceptable.
-
-any_other_function_with_shell_equals_true:
-  no_shell: [os.execl, os.execle, os.execlp, os.execlpe, os.execv, os.execve, os.execvp,
-    os.execvpe, os.spawnl, os.spawnle, os.spawnlp, os.spawnlpe, os.spawnv, os.spawnve,
-    os.spawnvp, os.spawnvpe, os.startfile]
-  shell: [os.system, os.popen, os.popen2, os.popen3, os.popen4, popen2.popen2, popen2.popen3,
-    popen2.popen4, popen2.Popen3, popen2.Popen4, commands.getoutput, commands.getstatusoutput]
-  subprocess: [subprocess.Popen, subprocess.call, subprocess.check_call, subprocess.check_output,
-    utils.execute, utils.execute_with_timeout]
-execute_with_run_as_root_equals_true:
-  function_names: [ceilometer.utils.execute, cinder.utils.execute, neutron.agent.linux.utils.execute,
-    nova.utils.execute, nova.utils.trycmd]
-hardcoded_tmp_directory:
-  tmp_dirs: [/tmp, /var/tmp, /dev/shm]
-linux_commands_wildcard_injection:
-  no_shell: [os.execl, os.execle, os.execlp, os.execlpe, os.execv, os.execve, os.execvp,
-    os.execvpe, os.spawnl, os.spawnle, os.spawnlp, os.spawnlpe, os.spawnv, os.spawnve,
-    os.spawnvp, os.spawnvpe, os.startfile]
-  shell: [os.system, os.popen, os.popen2, os.popen3, os.popen4, popen2.popen2, popen2.popen3,
-    popen2.popen4, popen2.Popen3, popen2.Popen4, commands.getoutput, commands.getstatusoutput]
-  subprocess: [subprocess.Popen, subprocess.call, subprocess.check_call, subprocess.check_output,
-    utils.execute, utils.execute_with_timeout]
-password_config_option_not_marked_secret:
-  function_names: [oslo.config.cfg.StrOpt, oslo_config.cfg.StrOpt]
-ssl_with_bad_defaults:
-  bad_protocol_versions: [PROTOCOL_SSLv2, SSLv2_METHOD, SSLv23_METHOD, PROTOCOL_SSLv3,
-    PROTOCOL_TLSv1, SSLv3_METHOD, TLSv1_METHOD]
-ssl_with_bad_version:
-  bad_protocol_versions: [PROTOCOL_SSLv2, SSLv2_METHOD, SSLv23_METHOD, PROTOCOL_SSLv3,
-    PROTOCOL_TLSv1, SSLv3_METHOD, TLSv1_METHOD]
-start_process_with_a_shell:
-  no_shell: [os.execl, os.execle, os.execlp, os.execlpe, os.execv, os.execve, os.execvp,
-    os.execvpe, os.spawnl, os.spawnle, os.spawnlp, os.spawnlpe, os.spawnv, os.spawnve,
-    os.spawnvp, os.spawnvpe, os.startfile]
-  shell: [os.system, os.popen, os.popen2, os.popen3, os.popen4, popen2.popen2, popen2.popen3,
-    popen2.popen4, popen2.Popen3, popen2.Popen4, commands.getoutput, commands.getstatusoutput]
-  subprocess: [subprocess.Popen, subprocess.call, subprocess.check_call, subprocess.check_output,
-    utils.execute, utils.execute_with_timeout]
-start_process_with_no_shell:
-  no_shell: [os.execl, os.execle, os.execlp, os.execlpe, os.execv, os.execve, os.execvp,
-    os.execvpe, os.spawnl, os.spawnle, os.spawnlp, os.spawnlpe, os.spawnv, os.spawnve,
-    os.spawnvp, os.spawnvpe, os.startfile]
-  shell: [os.system, os.popen, os.popen2, os.popen3, os.popen4, popen2.popen2, popen2.popen3,
-    popen2.popen4, popen2.Popen3, popen2.Popen4, commands.getoutput, commands.getstatusoutput]
-  subprocess: [subprocess.Popen, subprocess.call, subprocess.check_call, subprocess.check_output,
-    utils.execute, utils.execute_with_timeout]
-start_process_with_partial_path:
-  no_shell: [os.execl, os.execle, os.execlp, os.execlpe, os.execv, os.execve, os.execvp,
-    os.execvpe, os.spawnl, os.spawnle, os.spawnlp, os.spawnlpe, os.spawnv, os.spawnve,
-    os.spawnvp, os.spawnvpe, os.startfile]
-  shell: [os.system, os.popen, os.popen2, os.popen3, os.popen4, popen2.popen2, popen2.popen3,
-    popen2.popen4, popen2.Popen3, popen2.Popen4, commands.getoutput, commands.getstatusoutput]
-  subprocess: [subprocess.Popen, subprocess.call, subprocess.check_call, subprocess.check_output,
-    utils.execute, utils.execute_with_timeout]
-subprocess_popen_with_shell_equals_true:
-  no_shell: [os.execl, os.execle, os.execlp, os.execlpe, os.execv, os.execve, os.execvp,
-    os.execvpe, os.spawnl, os.spawnle, os.spawnlp, os.spawnlpe, os.spawnv, os.spawnve,
-    os.spawnvp, os.spawnvpe, os.startfile]
-  shell: [os.system, os.popen, os.popen2, os.popen3, os.popen4, popen2.popen2, popen2.popen3,
-    popen2.popen4, popen2.Popen3, popen2.Popen4, commands.getoutput, commands.getstatusoutput]
-  subprocess: [subprocess.Popen, subprocess.call, subprocess.check_call, subprocess.check_output,
-    utils.execute, utils.execute_with_timeout]
-subprocess_without_shell_equals_true:
-  no_shell: [os.execl, os.execle, os.execlp, os.execlpe, os.execv, os.execve, os.execvp,
-    os.execvpe, os.spawnl, os.spawnle, os.spawnlp, os.spawnlpe, os.spawnv, os.spawnve,
-    os.spawnvp, os.spawnvpe, os.startfile]
-  shell: [os.system, os.popen, os.popen2, os.popen3, os.popen4, popen2.popen2, popen2.popen3,
-    popen2.popen4, popen2.Popen3, popen2.Popen4, commands.getoutput, commands.getstatusoutput]
-  subprocess: [subprocess.Popen, subprocess.call, subprocess.check_call, subprocess.check_output,
-    utils.execute, utils.execute_with_timeout]
-try_except_continue: {check_typed_exception: false}
-try_except_pass: {check_typed_exception: false}
-

.coveragerc

@@ -1,11 +1,32 @@
 [run]
+parallel = True
 branch = True
 source =
     flake8
-
+    tests
+omit =
+    # Don't complain if non-runnable code isn't run
+    */__main__.py
 
 [paths]
 source =
     src/flake8
     .tox/*/lib/python*/site-packages/flake8
     .tox/pypy/site-packages/flake8
+
+[report]
+show_missing = True
+skip_covered = True
+exclude_lines =
+    # Have to re-enable the standard pragma
+    \#\s*pragma: no cover
+
+    # Don't complain if tests don't hit defensive assertion code:
+    ^\s*raise AssertionError\b
+    ^\s*raise NotImplementedError\b
+    ^\s*return NotImplemented\b
+    ^\s*raise$
+
+    # Don't complain if non-runnable code isn't run:
+    ^if __name__ == ['"]__main__['"]:$
+    ^\s*if False:

.gitlab-ci.yml

@@ -6,14 +6,23 @@ stages:
 - release
 
 before_script:
-- curl -O https://bootstrap.pypa.io/get-pip.py
-- python get-pip.py
+- pip install pip --upgrade
 - pip install -r dev-requirements.txt
 
 after_script:
 - pip install codecov
 - codecov --token=7d117e6b-aab6-4283-ab19-166dafc38cf5
 
+pypy2:
+  image: pypy:2.7-7.2.0
+  stage: test
+  script: tox -e pypy
+
+pypy3:
+  image: pypy:3.6-7.2.0
+  stage: test
+  script: tox -e pypy3
+
 python2:
   image: python:2.7
   stage: test
@@ -39,8 +48,13 @@ python37:
   stage: test
   script: tox -e py37
 
+python38:
+  image: python:3.8
+  stage: test
+  script: tox -e py38
+
 linters:
-  image: python:3.6
+  image: python:3.7
   stage: test
   script: tox -e linters
 
@@ -54,6 +68,7 @@ docs:
   script: tox -e docs
 
 dogfood:
+  image: python:3.7
   stage: test
   script: tox -e dogfood
 

.pre-commit-config.yaml

@@ -1,6 +1,12 @@
 repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+        exclude: ^tests/fixtures/diffs/
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.701
+    rev: v0.720
     hooks:
     -   id: mypy
         exclude: ^(docs/|example-plugin/|tests/fixtures)

.pylintrc

@@ -354,10 +354,6 @@ max-bool-expr=5
 
 
 [IMPORTS]
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=optparse
-
 # Create a graph of every (i.e. internal and external) dependencies in the
 # given file (report RP0402 must not be disabled)
 import-graph=

.travis.yml

@@ -1,4 +1,3 @@
-dist: xenial
 language: python
 cache: pip
 before_script:
@@ -22,9 +21,11 @@ matrix:
       env: TOXENV=py36
     - python: 3.7
       env: TOXENV=py37
+    - python: 3.8
+      env: TOXENV=py38
     - python: pypy
       env: TOXENV=pypy
-    - python: 2.7
+    - python: 3.7
       env: TOXENV=readme
     - python: 3.7
       env: TOXENV=flake8

codecov.yml

@@ -40,4 +40,3 @@ comment:
   layout: "header, diff, changes, sunburst, uncovered, tree"
   branches: null
   behavior: default
-

docs/source/glossary.rst

@@ -54,4 +54,4 @@
     mccabe
         The project |Flake8| depends on to calculate the McCabe complexity
         of a unit of code (e.g., a function). This uses the ``C``
-        :term:`class` of :term`error code`\ s.
+        :term:`class` of :term:`error code`\ s.

docs/source/internal/option_handling.rst

@@ -28,7 +28,7 @@ undocumented attribute that pep8 looks for, |Flake8| 3 now accepts a parameter
 to ``add_option``, specifically ``parse_from_config`` which is a boolean
 value.
 
-|Flake8| does this by creating its own abstractions on top of :mod:`optparse`.
+|Flake8| does this by creating its own abstractions on top of :mod:`argparse`.
 The first abstraction is the :class:`flake8.options.manager.Option` class. The
 second is the :class:`flake8.options.manager.OptionManager`. In fact, we add
 three new parameters:
@@ -67,7 +67,7 @@ example, let's consider a user's list of ignored error codes for a project:
         E251
 
 It makes sense here to allow users to specify the value this way, but, the
-standard libary's :class:`configparser.RawConfigParser` class does returns a
+standard library's :class:`configparser.RawConfigParser` class does returns a
 string that looks like
 
 .. code-block:: python
@@ -219,7 +219,7 @@ API Documentation
 .. autofunction:: flake8.options.aggregator.aggregate_options
 
 .. autoclass:: flake8.options.manager.Option
-    :members: __init__, normalize, to_optparse
+    :members: __init__, normalize, to_argparse
 
 .. autoclass:: flake8.options.manager.OptionManager
     :members:

docs/source/internal/utils.rst

@@ -25,13 +25,8 @@
 
     "E121,W123,F904"
     "E121,\nW123,\nF804"
-    "E121,\n\tW123,\n\tF804"
-
-Or it will take a list of strings (potentially with whitespace) such as
-
-.. code-block:: python
-
-    ["   E121\n", "\t\nW123   ", "\n\tF904\n    "]
+    " E121,\n\tW123,\n\tF804 "
+    " E121\n\tW123 \n\tF804"
 
 And converts it to a list that looks as follows
 
@@ -50,9 +45,9 @@ path if the string has a ``/`` in it. It also removes trailing ``/``\ s.
 
 .. autofunction:: flake8.utils.normalize_paths
 
-This function utilizes :func:`~flake8.utils.parse_comma_separated_list` and
-:func:`~flake8.utils.normalize_path` to normalize its input to a list of
-strings that should be paths.
+This function utilizes :func:`~flake8.utils.normalize_path` to normalize a
+sequence of paths.  See :func:`~flake8.utils.normalize_path` for what defines a
+normalized path.
 
 .. autofunction:: flake8.utils.stdin_get_value
 

docs/source/plugin-development/plugin-parameters.rst

@@ -72,7 +72,7 @@ Any plugin that has callable attributes ``add_options`` and
 Your ``add_options`` function should expect to receive an instance of
 |OptionManager|. An |OptionManager| instance behaves very similarly to
 :class:`optparse.OptionParser`. It, however, uses the layer that |Flake8| has
-developed on top of :mod:`optparse` to also handle configuration file parsing.
+developed on top of :mod:`argparse` to also handle configuration file parsing.
 :meth:`~flake8.options.manager.OptionManager.add_option` creates an |Option|
 which accepts the same parameters as :mod:`optparse` as well as three extra
 boolean parameters:
@@ -115,21 +115,21 @@ couple examples from |Flake8|. In each example, we will have
         '--max-line-length', type='int', metavar='n',
         default=defaults.MAX_LINE_LENGTH, parse_from_config=True,
         help='Maximum allowed line length for the entirety of this run. '
-             '(Default: %default)',
+             '(Default: %(default)s)',
     )
 
 Here we are adding the ``--max-line-length`` command-line option which is
 always an integer and will be parsed from the configuration file. Since we
-provide a default, we take advantage of :mod:`optparse`\ 's willingness to
-display that in the help text with ``%default``.
+provide a default, we take advantage of :mod:`argparse`\ 's willingness to
+display that in the help text with ``%(default)s``.
 
 .. code-block:: python
 
     option_manager.add_option(
         '--select', metavar='errors', default='',
         parse_from_config=True, comma_separated_list=True,
         help='Comma-separated list of errors and warnings to enable.'
-             ' For example, ``--select=E4,E51,W234``. (Default: %default)',
+             ' For example, ``--select=E4,E51,W234``. (Default: %(default)s)',
     )
 
 In adding the ``--select`` command-line option, we're also indicating to the
@@ -143,7 +143,7 @@ as a comma-separated list.
         comma_separated_list=True, parse_from_config=True,
         normalize_paths=True,
         help='Comma-separated list of files or directories to exclude.'
-             '(Default: %default)',
+             '(Default: %(default)s)',
     )
 
 Finally, we show an option that uses all three extra flags. Values from
@@ -152,18 +152,18 @@ list, and then each item will be normalized.
 
 For information about other parameters to
 :meth:`~flake8.options.manager.OptionManager.add_option` refer to the
-documentation of :mod:`optparse`.
+documentation of :mod:`argparse`.
 
 
 Accessing Parsed Options
 ========================
 
 When a plugin has a callable ``parse_options`` attribute, |Flake8| will call
 it and attempt to provide the |OptionManager| instance, the parsed options
-which will be an instance of :class:`optparse.Values`, and the extra arguments
-that were not parsed by the |OptionManager|. If that fails, we will just pass
-the :class:`optparse.Values`. In other words, your ``parse_options``
-callable will have one of the following signatures:
+which will be an instance of :class:`argparse.Namespace`, and the extra
+arguments that were not parsed by the |OptionManager|. If that fails, we will
+just pass the :class:`argparse.Namespace`. In other words, your
+``parse_options`` callable will have one of the following signatures:
 
 .. code-block:: python
 

docs/source/release-notes/3.7.0.rst

@@ -83,4 +83,3 @@ Features
     https://gitlab.com/pycqa/flake8/merge_requests/287
 .. _GitLab!288:
     https://gitlab.com/pycqa/flake8/merge_requests/288
-