Issue #77: fix — account for empty lines.
authorSteven Black <redacted>
Thu, 24 Mar 2016 22:32:46 +0000 (18:32 -0400)
committerSteven Black <redacted>
Thu, 24 Mar 2016 22:32:46 +0000 (18:32 -0400)
updateHostsFile.py

index 94bce08bb7809c4bbc349f905517017c785028bb..a6133cf616f0e6efb9ce69cbb7c60f958d6be190 100644 (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
git clone https://git.99rst.org/PROJECT