Remove @entry decorator (and misc cleanup) · lircs/pre-commit-hooks@2f1d2bb · GitHub
Skip to content

Commit 2f1d2bb

Browse files
committed
Remove @entry decorator (and misc cleanup)
1 parent 9bfa01d commit 2f1d2bb

13 files changed

Lines changed: 25 additions & 88 deletions

pre_commit_hooks/check_json.py

Lines changed: 3 additions & 6 deletions

pre_commit_hooks/check_yaml.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
import sys
55
import yaml
66

7-
from pre_commit_hooks.util import entry
87

9-
10-
@entry
11-
def check_yaml(argv):
8+
def check_yaml(argv=None):
129
parser = argparse.ArgumentParser()
1310
parser.add_argument('filenames', nargs='*', help='Yaml filenames to check.')
1411
args = parser.parse_args(argv)
@@ -17,8 +14,8 @@ def check_yaml(argv):
1714
for filename in args.filenames:
1815
try:
1916
yaml.load(open(filename))
20-
except yaml.YAMLError as e:
21-
print(e)
17+
except yaml.YAMLError as exc:
18+
print(exc)
2219
retval = 1
2320
return retval
2421

pre_commit_hooks/debug_statement_hook.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import collections
77
import traceback
88

9-
from pre_commit_hooks.util import entry
10-
119

1210
DEBUG_STATEMENTS = set(['pdb', 'ipdb', 'pudb'])
1311

@@ -61,8 +59,7 @@ def check_file_for_debug_statements(filename):
6159
return 0
6260

6361

64-
@entry
65-
def debug_statement_hook(argv):
62+
def debug_statement_hook(argv=None):
6663
parser = argparse.ArgumentParser()
6764
parser.add_argument('filenames', nargs='*', help='Filenames to run')
6865
args = parser.parse_args(argv)

pre_commit_hooks/end_of_file_fixer.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import os
66
import sys
77

8-
from pre_commit_hooks.util import entry
9-
108

119
def fix_file(file_obj):
1210
# Test for newline at end of file
@@ -46,8 +44,7 @@ def fix_file(file_obj):
4644
return 0
4745

4846

49-
@entry
50-
def end_of_file_fixer(argv):
47+
def end_of_file_fixer(argv=None):
5148
parser = argparse.ArgumentParser()
5249
parser.add_argument('filenames', nargs='*', help='Filenames to fix')
5350
args = parser.parse_args(argv)

pre_commit_hooks/requirements_txt_fixer.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import argparse
44

5-
from pre_commit_hooks.util import entry
6-
75

86
class Requirement(object):
97

@@ -67,16 +65,15 @@ def fix_requirements(f):
6765
return 1
6866

6967

70-
@entry
71-
def fix_requirements_txt(argv):
68+
def fix_requirements_txt(argv=None):
7269
parser = argparse.ArgumentParser()
7370
parser.add_argument('filenames', nargs='*', help='Filenames to fix')
7471
args = parser.parse_args(argv)
7572

7673
retv = 0
7774

7875
for arg in args.filenames:
79-
with open(arg, 'rb+') as f:
80-
retv |= fix_requirements(f)
76+
with open(arg, 'rb+') as file_obj:
77+
retv |= fix_requirements(file_obj)
8178

8279
return retv

pre_commit_hooks/tests_should_end_in_test.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22

33
import sys
44

5-
from pre_commit_hooks.util import entry
65

7-
8-
@entry
9-
def validate_files(argv):
6+
def validate_files(argv=None):
107
retcode = 0
118
for filename in argv:
129
if (

pre_commit_hooks/trailing_whitespace_fixer.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
import sys
66
from plumbum import local
77

8-
from pre_commit_hooks.util import entry
9-
108

119
def _fix_file(filename):
1210
for line in fileinput.input([filename], inplace=True):
1311
print(line.rstrip())
1412

1513

16-
@entry
17-
def fix_trailing_whitespace(argv):
14+
def fix_trailing_whitespace(argv=None):
1815
parser = argparse.ArgumentParser()
1916
parser.add_argument('filenames', nargs='*', help='Filenames to fix')
2017
args = parser.parse_args(argv)

pre_commit_hooks/util.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[MESSAGES CONTROL]
2-
disable=missing-docstring,abstract-method,redefined-builtin,invalid-name,no-value-for-parameter,redefined-outer-name,no-member,bad-open-mode
2+
disable=bad-open-mode,invalid-name,missing-docstring,redefined-outer-name
33

44
[REPORTS]
55
output-format=colorized

tests/end_of_file_fixer_test.py

Lines changed: 6 additions & 6 deletions

0 commit comments

Comments
 (0)