Merge pull request #490 from pre-commit/some_minor_cleanup · precommit/pre-commit@927f471 · GitHub
Skip to content

Commit 927f471

Browse files
authored
Merge pull request pre-commit#490 from pre-commit/some_minor_cleanup
Some minor cleanup
2 parents b32facc + e4eb2b0 commit 927f471

5 files changed

Lines changed: 16 additions & 22 deletions

File tree

pre_commit/constants.py

Lines changed: 7 additions & 0 deletions

pre_commit/envcontext.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
import contextlib
66
import os
77

8-
from pre_commit import five
9-
108

119
UNSET = collections.namedtuple('UNSET', ())()
1210

1311

1412
Var = collections.namedtuple('Var', ('name', 'default'))
15-
setattr(Var.__new__, five.defaults_attr, ('',))
13+
setattr(Var.__new__, '__defaults__', ('',))
1614

1715

1816
def format_env(parts, env):

pre_commit/five.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ def n(s):
1111
return s
1212
else:
1313
return s.encode('UTF-8')
14-
15-
defaults_attr = 'func_defaults'
1614
else: # pragma: no cover (PY3 only)
1715
text = str
1816

@@ -22,8 +20,6 @@ def n(s):
2220
else:
2321
return s.decode('UTF-8')
2422

25-
defaults_attr = '__defaults__'
26-
2723

2824
def to_text(s):
2925
return s if isinstance(s, text) else s.decode('UTF-8')

pre_commit/main.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import os
55
import sys
66

7-
import pkg_resources
8-
7+
import pre_commit.constants as C
98
from pre_commit import color
109
from pre_commit import five
1110
from pre_commit import git
@@ -51,9 +50,7 @@ def main(argv=None):
5150
parser.add_argument(
5251
'-V', '--version',
5352
action='version',
54-
version='%(prog)s {}'.format(
55-
pkg_resources.get_distribution('pre-commit').version
56-
)
53+
version='%(prog)s {}'.format(C.VERSION),
5754
)
5855

5956
subparsers = parser.add_subparsers(dest='command')

pre_commit/repository.py

Lines changed: 6 additions & 10 deletions

0 commit comments

Comments
 (0)