Issue #77: fix — account for empty lines.

This commit is contained in:
Steven Black 2016-03-24 18:32:46 -04:00
parent 883faf0f64
commit 94ea41fa16

View File

@ -315,12 +315,14 @@ def removeDupsAndExcl(mergeFile):
exclusions = settings["exclusions"]
for line in mergeFile.readlines():
write = 'true'
# Trim trailing whitespace
line = line.rstrip()
# Explicit encoding
line = line.decode("UTF-8")
# replace tabs with space
line = line.replace('\t+', ' ')
# Trim trailing whitespace
line = line.rstrip()
if not line:
continue
# Testing the first character doesn't require startswith
if line[0] == '#' or re.match(r'^\s*$', line[0]):
# Cross-python write