Remove encoding dependence

This commit is contained in:
Thierry Deo
2018-03-07 09:24:56 +01:00
parent 3793bc32c0
commit 25c06e6525
2 changed files with 21 additions and 4 deletions

View File

@@ -30,10 +30,10 @@ def _process_filename_by_line(pattern, filename):
def _process_filename_at_once(pattern, filename):
retv = 0
with open(filename, 'rb') as f:
match = pattern.search(f.read().decode('utf-8').replace('\n', ''))
match = pattern.search(f.read())
if match:
retv = 1
output.write('{}:'.format(filename))
output.write('{}:{}-{}:'.format(filename, match.start(), match.end()))
output.write_line(match.group())
return retv
@@ -59,6 +59,9 @@ def main(argv=None):
args = parser.parse_args(argv)
flags = re.IGNORECASE if args.ignore_case else 0
if args.null_data:
flags = flags | re.MULTILINE | re.DOTALL
pattern = re.compile(args.pattern.encode(), flags)
retv = 0