Skip to content

Commit

Permalink
AppliedPEP8 to python source
Browse files Browse the repository at this point in the history
  • Loading branch information
zuBux committed Nov 23, 2015
1 parent 1ffb31d commit dfddca9
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions safe-commit-hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,47 +5,52 @@
import subprocess
import re

DEFAULT_PATTERNS=os.path.expanduser('~/.safe-commit-hook/git-deny-patterns.json')
DEFAULT_PATTERNS = os.path.expanduser('~/.safe-commit-hook/git-deny-patterns.json')
REPO_ROOT = os.getcwd()
WHITELIST = os.path.join(REPO_ROOT, '.whitelist')


def make_exact_matcher(str):
def m(target):
return str == target
return m
return m


def make_regex_matcher(pattern):
prog = re.compile(pattern)
def m(target):
return prog.match(target)
return m
return prog.match(target)
return m


def make_str_matcher(p):
if p['type'] == 'regex':
return make_regex_matcher(p['pattern'])
elif p['type'] == 'match':
return make_exact_matcher(p['pattern'])


def make_filename_matcher(p):
def m(target_filename):
t = os.path.basename(target_filename)
return p['_match'](t)
return m


def make_extension_matcher(p):
def m(target_filename):
_, file_extension = os.path.splitext(target_filename)
file_extension = file_extension[1:]
return p['_match'](file_extension)
return m


def make_path_matcher(p):
def m(target_filename):
return p['_match'](target_filename)
return m


def make_matcher(p):
p['_match'] = make_str_matcher(p)

Expand All @@ -56,16 +61,18 @@ def make_matcher(p):
if p['part'] == 'path':
return make_path_matcher(p)


def read_patterns():
matchers = []
with open(DEFAULT_PATTERNS) as data_file:
with open(DEFAULT_PATTERNS) as data_file:
data = json.load(data_file)
for p in data:
matcher = make_matcher(p)
if matcher:
p['matcher'] = matcher
matchers.append(p)
return matchers
return matchers


def load_whitelist():
ignore = []
Expand All @@ -76,6 +83,7 @@ def load_whitelist():
ignore.append(path)
return ignore


def match_patterns(patterns, files, whitelist=None):
commit_safe = True
for f in files:
Expand All @@ -95,7 +103,7 @@ def match_patterns(patterns, files, whitelist=None):
exit(1)


cmd='git diff --name-only --cached'
cmd = 'git diff --name-only --cached'
result = subprocess.check_output(cmd, shell=True)
files = result.split("\n")
patterns = read_patterns()
Expand All @@ -105,4 +113,3 @@ def match_patterns(patterns, files, whitelist=None):
match_patterns(patterns, files, whitelist)
else:
match_patterns(patterns, files)

0 comments on commit dfddca9

Please sign in to comment.