Fix check-merge-conflict against binary files
diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py
index ec09473..4a98843 100644
--- a/pre_commit_hooks/check_merge_conflict.py
+++ b/pre_commit_hooks/check_merge_conflict.py
@@ -5,10 +5,10 @@
import sys
CONFLICT_PATTERNS = [
- '<<<<<<< ',
- '======= ',
- '=======\n',
- '>>>>>>> '
+ b'<<<<<<< ',
+ b'======= ',
+ b'=======\n',
+ b'>>>>>>> '
]
WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'
@@ -30,11 +30,13 @@
retcode = 0
for filename in args.filenames:
- with open(filename) as inputfile:
+ with open(filename, 'rb') as inputfile:
for i, line in enumerate(inputfile):
for pattern in CONFLICT_PATTERNS:
if line.startswith(pattern):
- print(WARNING_MSG.format(pattern, filename, i + 1))
+ print(WARNING_MSG.format(
+ pattern.decode(), filename, i + 1,
+ ))
retcode = 1
return retcode
