Use asottile/add-trailing-comma

asottile · asottile · commit 0c70fa422929 · 2017-07-12T18:30:51.000-07:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,3 +21,7 @@
     hooks:
     -   id: reorder-python-imports
         language_version: python2.7
+-   repo: https://github.com/asottile/add-trailing-comma
+    sha: v0.3.0
+    hooks:
+    -   id: add-trailing-comma
diff --git a/pre_commit/color_windows.py b/pre_commit/color_windows.py
@@ -20,18 +20,18 @@ def bool_errcheck(result, func, args):
 
 GetStdHandle = WINFUNCTYPE(HANDLE, DWORD)(
     ("GetStdHandle", windll.kernel32),
-    ((1, "nStdHandle"), )
+    ((1, "nStdHandle"), ),
 )
 
 GetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, POINTER(DWORD))(
     ("GetConsoleMode", windll.kernel32),
-    ((1, "hConsoleHandle"), (2, "lpMode"))
+    ((1, "hConsoleHandle"), (2, "lpMode")),
 )
 GetConsoleMode.errcheck = bool_errcheck
 
 SetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, DWORD)(
     ("SetConsoleMode", windll.kernel32),
-    ((1, "hConsoleHandle"), (1, "dwMode"))
+    ((1, "hConsoleHandle"), (1, "dwMode")),
 )
 SetConsoleMode.errcheck = bool_errcheck
 
diff --git a/pre_commit/commands/autoupdate.py b/pre_commit/commands/autoupdate.py
@@ -59,7 +59,7 @@ def _update_repo(repo_config, runner, tags_only):
     if hooks_missing:
         raise RepositoryCannotBeUpdatedError(
             'Cannot update because the tip of master is missing these hooks:\n'
-            '{}'.format(', '.join(sorted(hooks_missing)))
+            '{}'.format(', '.join(sorted(hooks_missing))),
         )
 
     return new_config
diff --git a/pre_commit/commands/install_uninstall.py b/pre_commit/commands/install_uninstall.py
@@ -51,7 +51,7 @@ def install(
             'Running in migration mode with existing hooks at {}\n'
             'Use -f to use only pre-commit.'.format(
                 legacy_path,
-            )
+            ),
         )
 
     with io.open(hook_path, 'w') as pre_commit_file_obj:
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -235,7 +235,7 @@ def run(runner, args, environ=os.environ):
             logger.error(
                 'Your .pre-commit-config.yaml is unstaged.\n'
                 '`git add .pre-commit-config.yaml` to fix this.\n'
-                'Run pre-commit with --allow-unstaged-config to silence this.'
+                'Run pre-commit with --allow-unstaged-config to silence this.',
             )
             return 1
 
diff --git a/pre_commit/git.py b/pre_commit/git.py
@@ -21,7 +21,7 @@ def get_root():
     except CalledProcessError:
         raise FatalError(
             'git failed. Is it installed, and are you in a Git repository '
-            'directory?'
+            'directory?',
         )
 
 
@@ -79,7 +79,7 @@ def get_staged_files():
     return cmd_output(
         'git', 'diff', '--staged', '--name-only', '--no-ext-diff',
         # Everything except for D
-        '--diff-filter=ACMRTUXB'
+        '--diff-filter=ACMRTUXB',
     )[1].splitlines()
 
 
@@ -130,5 +130,5 @@ def check_for_cygwin_mismatch():
                 ' - git {}\n'.format(
                     exe_type[is_cygwin_python],
                     exe_type[is_cygwin_git],
-                )
+                ),
             )
diff --git a/pre_commit/languages/docker.py b/pre_commit/languages/docker.py
@@ -23,7 +23,7 @@ def md5(s):  # pragma: windows no cover
 
 def docker_tag(repo_cmd_runner):  # pragma: windows no cover
     return 'pre-commit-{}'.format(
-        md5(os.path.basename(repo_cmd_runner.path()))
+        md5(os.path.basename(repo_cmd_runner.path())),
     ).lower()
 
 
@@ -92,7 +92,7 @@ def run_hook(repo_cmd_runner, hook, file_args):  # pragma: windows no cover
         '-v', '{}:/src:rw'.format(os.getcwd()),
         '--workdir', '/src',
         '--entrypoint', entry_executable,
-        docker_tag(repo_cmd_runner)
+        docker_tag(repo_cmd_runner),
     ) + cmd_rest
 
     return xargs(cmd, file_args)
diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
@@ -107,7 +107,7 @@ def install_environment(repo_cmd_runner, version, additional_dependencies):
     with clean_path_on_failure(repo_cmd_runner.path(directory)):
         venv_cmd = [
             sys.executable, '-m', 'virtualenv',
-            '{{prefix}}{}'.format(directory)
+            '{{prefix}}{}'.format(directory),
         ]
         if version != 'default':
             venv_cmd.extend(['-p', norm_version(version)])
diff --git a/pre_commit/languages/ruby.py b/pre_commit/languages/ruby.py
@@ -81,7 +81,7 @@ def _install_rbenv(
             # directory
             "export GEM_HOME='{directory}/gems'\n"
             'export PATH="$GEM_HOME/bin:$PATH"\n'
-            '\n'.format(directory=repo_cmd_runner.path(directory))
+            '\n'.format(directory=repo_cmd_runner.path(directory)),
         )
 
         # If we aren't using the system ruby, add a version here
diff --git a/pre_commit/logging_handler.py b/pre_commit/logging_handler.py
@@ -30,7 +30,7 @@ def emit(self, record):
                     self.use_color,
                 ) + ' ',
                 record.getMessage(),
-            )
+            ),
         )
 
 
diff --git a/pre_commit/main.py b/pre_commit/main.py
@@ -41,7 +41,7 @@ def _add_color_option(parser):
 def _add_config_option(parser):
     parser.add_argument(
         '-c', '--config', default='.pre-commit-config.yaml',
-        help='Path to alternate config file'
+        help='Path to alternate config file',
     )
 
 
@@ -228,11 +228,11 @@ def main(argv=None):
             return sample_config()
         else:
             raise NotImplementedError(
-                'Command {} not implemented.'.format(args.command)
+                'Command {} not implemented.'.format(args.command),
             )
 
         raise AssertionError(
-            'Command {} failed to exit with a returncode'.format(args.command)
+            'Command {} failed to exit with a returncode'.format(args.command),
         )
 
 
diff --git a/pre_commit/make_archives.py b/pre_commit/make_archives.py
@@ -28,7 +28,7 @@
 
 
 RESOURCES_DIR = os.path.abspath(
-    os.path.join(os.path.dirname(__file__), 'resources')
+    os.path.join(os.path.dirname(__file__), 'resources'),
 )
 
 
diff --git a/pre_commit/manifest.py b/pre_commit/manifest.py
@@ -31,7 +31,7 @@ def manifest_contents(self):
                 'If `pre-commit autoupdate` does not silence this warning '
                 'consider making an issue / pull request.'.format(
                     self.repo_url, C.MANIFEST_FILE_LEGACY, C.MANIFEST_FILE,
-                )
+                ),
             )
             return load_manifest(legacy_path)
         else:
diff --git a/pre_commit/output.py b/pre_commit/output.py
@@ -50,7 +50,7 @@ def get_hook_message(
         raise ValueError('Expected one of (`end_msg`, `end_len`)')
     if end_msg is not None and (end_color is None or use_color is None):
         raise ValueError(
-            '`end_color` and `use_color` are required with `end_msg`'
+            '`end_color` and `use_color` are required with `end_msg`',
         )
 
     if end_len:
diff --git a/pre_commit/prefixed_command_runner.py b/pre_commit/prefixed_command_runner.py
@@ -20,7 +20,7 @@ def __init__(
             self,
             prefix_dir,
             popen=subprocess.Popen,
-            makedirs=os.makedirs
+            makedirs=os.makedirs,
     ):
         self.prefix_dir = prefix_dir.rstrip(os.sep) + os.sep
         self.__popen = popen
diff --git a/pre_commit/repository.py b/pre_commit/repository.py
@@ -72,7 +72,7 @@ def _install_all(venvs, repo_url):
 
     if need_installed:
         logger.info(
-            'Installing environment for {}.'.format(repo_url)
+            'Installing environment for {}.'.format(repo_url),
         )
         logger.info('Once installed this environment will be reused.')
         logger.info('This may take a few minutes...')
@@ -102,7 +102,7 @@ def _validate_minimum_version(hook):
             'version {} is installed.  '
             'Perhaps run `pip install --upgrade pre-commit`.'.format(
                 hook['id'], hook_version, C.VERSION_PARSED,
-            )
+            ),
         )
         exit(1)
     return hook
@@ -147,7 +147,7 @@ def hooks(self):
                     'Typo? Perhaps it is introduced in a newer version?  '
                     'Often `pre-commit autoupdate` fixes this.'.format(
                         hook['id'], self.repo_config['repo'],
-                    )
+                    ),
                 )
                 exit(1)
 
diff --git a/pre_commit/schema.py b/pre_commit/schema.py
@@ -112,7 +112,7 @@ def _check_conditional(self, dct):
                 cond_key=self.condition_key,
                 op=op,
                 cond_val=cond_val,
-            )
+            ),
         )
 
 
diff --git a/pre_commit/staged_files_only.py b/pre_commit/staged_files_only.py
@@ -49,7 +49,7 @@ def staged_files_only(cmd_runner):
             except CalledProcessError:
                 logger.warning(
                     'Stashed changes conflicted with hook auto-fixes... '
-                    'Rolling back fixes...'
+                    'Rolling back fixes...',
                 )
                 # We failed to apply the patch, presumably due to fixes made
                 # by hooks.
diff --git a/pre_commit/store.py b/pre_commit/store.py
@@ -49,7 +49,7 @@ def _write_readme(self):
         with io.open(os.path.join(self.directory, 'README'), 'w') as readme:
             readme.write(
                 'This directory is maintained by the pre-commit project.\n'
-                'Learn more: https://github.com/pre-commit/pre-commit\n'
+                'Learn more: https://github.com/pre-commit/pre-commit\n',
             )
 
     def _write_sqlite_db(self):
@@ -68,7 +68,7 @@ def _write_sqlite_db(self):
                 '    ref CHAR(255) NOT NULL,'
                 '    path CHAR(255) NOT NULL,'
                 '    PRIMARY KEY (repo, ref)'
-                ');'
+                ');',
             )
 
         # Atomic file move
diff --git a/pre_commit/util.py b/pre_commit/util.py
@@ -124,7 +124,7 @@ def to_bytes(self):
             if maybe_text:
                 output.append(
                     b'\n    ' +
-                    five.to_bytes(maybe_text).replace(b'\n', b'\n    ')
+                    five.to_bytes(maybe_text).replace(b'\n', b'\n    '),
                 )
             else:
                 output.append(b'(none)')
@@ -134,8 +134,8 @@ def to_bytes(self):
                 'Command: {!r}\n'
                 'Return code: {}\n'
                 'Expected return code: {}\n'.format(
-                    self.cmd, self.returncode, self.expected_returncode
-                )
+                    self.cmd, self.returncode, self.expected_returncode,
+                ),
             ),
             b'Output: ', output[0], b'\n',
             b'Errors: ', output[1], b'\n',
diff --git a/testing/fixtures.py b/testing/fixtures.py
@@ -75,7 +75,7 @@ def config_with_local_hooks():
             ('entry', 'DO NOT COMMIT'),
             ('language', 'pcre'),
             ('files', '^(.*)$'),
-        ))])
+        ))]),
     ))
 
 
diff --git a/testing/util.py b/testing/util.py
@@ -34,7 +34,7 @@ def cmd_output_mocked_pre_commit_home(*args, **kwargs):
 
 skipif_cant_run_docker = pytest.mark.skipif(
     docker_is_running() is False,
-    reason='Docker isn\'t running or can\'t  be accessed'
+    reason='Docker isn\'t running or can\'t  be accessed',
 )
 
 skipif_slowtests_false = pytest.mark.skipif(
@@ -44,7 +44,7 @@ def cmd_output_mocked_pre_commit_home(*args, **kwargs):
 
 skipif_cant_run_swift = pytest.mark.skipif(
     parse_shebang.find_executable('swift') is None,
-    reason='swift isn\'t installed or can\'t be found'
+    reason='swift isn\'t installed or can\'t be found',
 )
 
 xfailif_windows_no_ruby = pytest.mark.xfail(
diff --git a/tests/clientlib_test.py b/tests/clientlib_test.py
@@ -208,7 +208,7 @@ def test_validate_manifest_main(args, expected_output):
             }],
             True,
         ),
-    )
+    ),
 )
 def test_valid_manifests(manifest_obj, expected):
     ret = is_valid_according_to_schema(manifest_obj, MANIFEST_SCHEMA)
diff --git a/tests/commands/autoupdate_test.py b/tests/commands/autoupdate_test.py
@@ -105,7 +105,7 @@ def test_out_of_date_repo(out_of_date_repo, runner_with_mocked_store):
 
 
 def test_autoupdate_out_of_date_repo(
-        out_of_date_repo, in_tmpdir, mock_out_store_directory
+        out_of_date_repo, in_tmpdir, mock_out_store_directory,
 ):
     # Write out the config
     config = make_config_from_repo(
@@ -181,7 +181,7 @@ def hook_disappearing_repo(tempdir_factory):
 
 
 def test_hook_disppearing_repo_raises(
-        hook_disappearing_repo, runner_with_mocked_store
+        hook_disappearing_repo, runner_with_mocked_store,
 ):
     config = make_config_from_repo(
         hook_disappearing_repo.path,
@@ -193,7 +193,7 @@ def test_hook_disppearing_repo_raises(
 
 
 def test_autoupdate_hook_disappearing_repo(
-        hook_disappearing_repo, in_tmpdir, mock_out_store_directory
+        hook_disappearing_repo, in_tmpdir, mock_out_store_directory,
 ):
     config = make_config_from_repo(
         hook_disappearing_repo.path,
@@ -222,7 +222,7 @@ def test_autoupdate_local_hooks(tempdir_factory):
 
 
 def test_autoupdate_local_hooks_with_out_of_date_repo(
-        out_of_date_repo, in_tmpdir, mock_out_store_directory
+        out_of_date_repo, in_tmpdir, mock_out_store_directory,
 ):
     stale_config = make_config_from_repo(
         out_of_date_repo.path, sha=out_of_date_repo.original_sha, check=False,
diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py
@@ -145,7 +145,7 @@ def _get_commit_output(tempdir_factory, touch_file='foo', **kwargs):
     r'Bash hook\.+Passed\r?\n'
     r'\[master [a-f0-9]{7}\] Commit!\r?\n' +
     FILES_CHANGED +
-    r' create mode 100644 foo\r?\n$'
+    r' create mode 100644 foo\r?\n$',
 )
 
 
@@ -259,7 +259,7 @@ def test_environment_not_sourced(tempdir_factory):
     r'\r?\n'
     r'Fail\r?\n'
     r'foo\r?\n'
-    r'\r?\n$'
+    r'\r?\n$',
 )
 
 
@@ -277,7 +277,7 @@ def test_failing_hooks_returns_nonzero(tempdir_factory):
     r'^legacy hook\r?\n'
     r'\[master [a-f0-9]{7}\] Commit!\r?\n' +
     FILES_CHANGED +
-    r' create mode 100644 baz\r?\n$'
+    r' create mode 100644 baz\r?\n$',
 )
 
 
@@ -332,7 +332,7 @@ def test_install_existing_hook_no_overwrite_idempotent(tempdir_factory):
 FAIL_OLD_HOOK = re.compile(
     r'fail!\r?\n'
     r'\[INFO\] Initializing environment for .+\.\r?\n'
-    r'Bash hook\.+Passed\r?\n'
+    r'Bash hook\.+Passed\r?\n',
 )
 
 
@@ -448,7 +448,7 @@ def test_uninstall_doesnt_remove_not_our_hooks(tempdir_factory):
     r'Bash hook\.+Passed\r?\n'
     r'\[master [a-f0-9]{7}\] Commit!\r?\n' +
     FILES_CHANGED +
-    r' create mode 100644 foo\r?\n$'
+    r' create mode 100644 foo\r?\n$',
 )
 
 
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
diff --git a/tests/languages/docker_test.py b/tests/languages/docker_test.py
diff --git a/tests/prefixed_command_runner_test.py b/tests/prefixed_command_runner_test.py
diff --git a/tests/repository_test.py b/tests/repository_test.py
diff --git a/tests/runner_test.py b/tests/runner_test.py
diff --git a/tests/schema_test.py b/tests/schema_test.py
diff --git a/tests/store_test.py b/tests/store_test.py

Original file line number	Diff line number	Diff line change
`@@ -20,18 +20,18 @@ def bool_errcheck(result, func, args):`
`20`	`20`
`21`	`21`	`GetStdHandle = WINFUNCTYPE(HANDLE, DWORD)(`
`22`	`22`	`("GetStdHandle", windll.kernel32),`
`23`		`- ((1, "nStdHandle"), )`
	`23`	`+ ((1, "nStdHandle"), ),`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`GetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, POINTER(DWORD))(`
`27`	`27`	`("GetConsoleMode", windll.kernel32),`
`28`		`- ((1, "hConsoleHandle"), (2, "lpMode"))`
	`28`	`+ ((1, "hConsoleHandle"), (2, "lpMode")),`
`29`	`29`	`)`
`30`	`30`	`GetConsoleMode.errcheck = bool_errcheck`
`31`	`31`
`32`	`32`	`SetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, DWORD)(`
`33`	`33`	`("SetConsoleMode", windll.kernel32),`
`34`		`- ((1, "hConsoleHandle"), (1, "dwMode"))`
	`34`	`+ ((1, "hConsoleHandle"), (1, "dwMode")),`
`35`	`35`	`)`
`36`	`36`	`SetConsoleMode.errcheck = bool_errcheck`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ def _update_repo(repo_config, runner, tags_only):`
`59`	`59`	`if hooks_missing:`
`60`	`60`	`raise RepositoryCannotBeUpdatedError(`
`61`	`61`	`'Cannot update because the tip of master is missing these hooks:\n'`
`62`		`- '{}'.format(', '.join(sorted(hooks_missing)))`
	`62`	`+ '{}'.format(', '.join(sorted(hooks_missing))),`
`63`	`63`	`)`
`64`	`64`
`65`	`65`	`return new_config`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def install(`
`51`	`51`	`'Running in migration mode with existing hooks at {}\n'`
`52`	`52`	`'Use -f to use only pre-commit.'.format(`
`53`	`53`	`legacy_path,`
`54`		`- )`
	`54`	`+ ),`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`with io.open(hook_path, 'w') as pre_commit_file_obj:`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ def run(runner, args, environ=os.environ):`
`235`	`235`	`logger.error(`
`236`	`236`	`'Your .pre-commit-config.yaml is unstaged.\n'`
`237`	`237`	'`git add .pre-commit-config.yaml` to fix this.\n'
`238`		`- 'Run pre-commit with --allow-unstaged-config to silence this.'`
	`238`	`+ 'Run pre-commit with --allow-unstaged-config to silence this.',`
`239`	`239`	`)`
`240`	`240`	`return 1`
`241`	`241`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ def install_environment(repo_cmd_runner, version, additional_dependencies):`
`107`	`107`	`with clean_path_on_failure(repo_cmd_runner.path(directory)):`
`108`	`108`	`venv_cmd = [`
`109`	`109`	`sys.executable, '-m', 'virtualenv',`
`110`		`- '{{prefix}}{}'.format(directory)`
	`110`	`+ '{{prefix}}{}'.format(directory),`
`111`	`111`	`]`
`112`	`112`	`if version != 'default':`
`113`	`113`	`venv_cmd.extend(['-p', norm_version(version)])`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ def _install_rbenv(`
`81`	`81`	`# directory`
`82`	`82`	`"export GEM_HOME='{directory}/gems'\n"`
`83`	`83`	`'export PATH="$GEM_HOME/bin:$PATH"\n'`
`84`		`- '\n'.format(directory=repo_cmd_runner.path(directory))`
	`84`	`+ '\n'.format(directory=repo_cmd_runner.path(directory)),`
`85`	`85`	`)`
`86`	`86`
`87`	`87`	`# If we aren't using the system ruby, add a version here`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ def emit(self, record):`
`30`	`30`	`self.use_color,`
`31`	`31`	`) + ' ',`
`32`	`32`	`record.getMessage(),`
`33`		`- )`
	`33`	`+ ),`
`34`	`34`	`)`
`35`	`35`
`36`	`36`