Use set rather than list for commit message related stages, remove

mjay-taskize · mjay-taskize · commit 82969e4ba362 · 2019-04-21T21:58:01.000+01:00
default file open modes, tidy up bash call for failing hook test
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -190,7 +190,7 @@ def _compute_cols(hooks, verbose):
 def _all_filenames(args):
     if args.origin and args.source:
         return git.get_changed_files(args.origin, args.source)
-    elif args.hook_stage in ['prepare-commit-msg', 'commit-msg']:
+    elif args.hook_stage in {'prepare-commit-msg', 'commit-msg'}:
         return (args.commit_msg_filename,)
     elif args.files:
         return args.files
diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py
@@ -678,7 +678,7 @@ def test_prepare_commit_msg_integration_passing(
     commit_msg_path = os.path.join(
         prepare_commit_msg_repo, '.git/COMMIT_EDITMSG',
     )
-    with io.open(commit_msg_path, 'rt') as f:
+    with io.open(commit_msg_path) as f:
         assert 'Signed off by: ' in f.read()
 
 
@@ -709,7 +709,7 @@ def test_prepare_commit_msg_legacy(
     commit_msg_path = os.path.join(
         prepare_commit_msg_repo, '.git/COMMIT_EDITMSG',
     )
-    with io.open(commit_msg_path, 'rt') as f:
+    with io.open(commit_msg_path) as f:
         assert 'Signed off by: ' in f.read()
 
 
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -615,7 +615,7 @@ def test_prepare_commit_msg_hook(cap_out, store, prepare_commit_msg_repo):
         stage=False,
     )
 
-    with io.open(filename, 'rt') as f:
+    with io.open(filename) as f:
         assert 'Signed off by: ' in f.read()
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -171,7 +171,7 @@ def failing_prepare_commit_msg_repo(tempdir_factory):
         'hooks': [{
             'id': 'add-signoff',
             'name': 'Add "Signed off by:"',
-            'entry': '/usr/bin/env bash -c "exit 1"',
+            'entry': 'bash -c "exit 1"',
             'language': 'system',
             'stages': ['prepare-commit-msg'],
         }],

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ def test_prepare_commit_msg_integration_passing(`
`678`	`678`	`commit_msg_path = os.path.join(`
`679`	`679`	`prepare_commit_msg_repo, '.git/COMMIT_EDITMSG',`
`680`	`680`	`)`
`681`		`- with io.open(commit_msg_path, 'rt') as f:`
	`681`	`+ with io.open(commit_msg_path) as f:`
`682`	`682`	`assert 'Signed off by: ' in f.read()`
`683`	`683`
`684`	`684`
`@@ -709,7 +709,7 @@ def test_prepare_commit_msg_legacy(`
`709`	`709`	`commit_msg_path = os.path.join(`
`710`	`710`	`prepare_commit_msg_repo, '.git/COMMIT_EDITMSG',`
`711`	`711`	`)`
`712`		`- with io.open(commit_msg_path, 'rt') as f:`
	`712`	`+ with io.open(commit_msg_path) as f:`
`713`	`713`	`assert 'Signed off by: ' in f.read()`
`714`	`714`
`715`	`715`
Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ def test_prepare_commit_msg_hook(cap_out, store, prepare_commit_msg_repo):`
`615`	`615`	`stage=False,`
`616`	`616`	`)`
`617`	`617`
`618`		`- with io.open(filename, 'rt') as f:`
	`618`	`+ with io.open(filename) as f:`
`619`	`619`	`assert 'Signed off by: ' in f.read()`
`620`	`620`
`621`	`621`