From: Steven Black <redacted>
Date: Thu, 24 Mar 2016 22:32:46 +0000 (-0400)
Subject: Issue #77: fix — account for empty lines.
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=94ea41fa161e50920693d3ce8c52d6fb2dfda5e6;p=stevenblack-hosts.git

Issue #77: fix — account for empty lines.
---

diff --git a/updateHostsFile.py b/updateHostsFile.py
index 94bce08bb..a6133cf61 100644
--- a/updateHostsFile.py
+++ b/updateHostsFile.py
@@ -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