From: Steven Black <redacted>
Date: Fri, 2 Jan 2015 02:35:11 +0000 (-0500)
Subject: Issue #8: fix - Update the stripRule() function to be smarter about whitespace preced... 
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f5d622a4137e2a3c2acd5fc08047b5985009138f;p=stevenblack-hosts.git

Issue #8: fix - Update the stripRule() function to be smarter about whitespace preceding comments.  Thanks @caneylan.
---

diff --git a/updateHostsFile.py b/updateHostsFile.py
index 709a525fa..af8555e3a 100644
--- a/updateHostsFile.py
+++ b/updateHostsFile.py
@@ -165,7 +165,7 @@ def removeDups(mergeFile):
 
 	hostnames = set()
 	for line in mergeFile.readlines():
-		if line[0].startswith("#") or line[0] == '\n':
+		if line[0].startswith("#") or re.match(r'^\s*$', line[0]):
 			finalFile.write(line) #maintain the comments for readability
 			continue
 		strippedRule = stripRule(line) #strip comments
@@ -249,7 +249,7 @@ def moveHostsFileIntoPlace(finalFile):
 ## {{{ http://code.activestate.com/recipes/577058/ (r2)
 def query_yes_no(question, default="yes"):
     """Ask a yes/no question via raw_input() and return their answer.
-    
+
     "question" is a string that is presented to the user.
     "default" is the presumed answer if the user just hits <Enter>.
         It must be "yes" (the default), "no" or None (meaning