From ec362d81c5a75bd6e28a63f134cef6c60bc17626 Mon Sep 17 00:00:00 2001 From: funilrys Date: Thu, 13 Sep 2018 09:16:40 +0200 Subject: [PATCH] Deletion of the extra `\n` after each (and especially commented) line. This patch partially fix StevenBlack/hosts#777 . --- updateHostsFile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updateHostsFile.py b/updateHostsFile.py index e1e1e715d..09affa6a9 100644 --- a/updateHostsFile.py +++ b/updateHostsFile.py @@ -628,8 +628,8 @@ def create_initial_file(): for source in recursive_glob(settings["datapath"], settings["hostfilename"]): - start = "# Start {}\n".format(os.path.basename(os.path.dirname(source))) - end = "# End {}\n".format(os.path.basename(os.path.dirname(source))) + start = "# Start {}\n\n".format(os.path.basename(os.path.dirname(source))) + end = "# End {}\n\n".format(os.path.basename(os.path.dirname(source))) with open(source, "r") as curFile: write_data(merge_file, start + curFile.read() + end) @@ -772,7 +772,7 @@ def remove_dups_and_excl(merge_file, exclusion_regexes, output_file=None): line = line.replace("\t+", " ") # see gh-271: trim trailing whitespace, periods - line = line.rstrip(' .') + "\n" + line = line.rstrip(' .') # Testing the first character doesn't require startswith if line[0] == "#" or re.match(r'^\s*$', line[0]):