Remove references to .zip files in the generator programs.

This commit is contained in:
Steven Black
2017-08-20 12:00:19 -04:00
parent 59c595ebcb
commit 68dcf5c125
3 changed files with 16 additions and 31 deletions

View File

@@ -23,7 +23,6 @@ import fnmatch
import argparse
import socket
import json
import zipfile
# Detecting Python 3 for version-dependent implementations
PY3 = sys.version_info >= (3, 0)
@@ -66,7 +65,6 @@ def get_defaults():
"outputsubfolder": "",
"hostfilename": "hosts",
"targetip": "0.0.0.0",
"ziphosts": False,
"sourcedatafilename": "update.json",
"sourcesdata": [],
"readmefilename": "readme.md",
@@ -102,10 +100,6 @@ def main():
parser.add_argument("--keepdomaincomments", "-k",
dest="keepdomaincomments", default=False,
help="Keep domain line comments.")
parser.add_argument("--zip", "-z", dest="ziphosts", default=False,
action="store_true", help="Additionally create "
"a zip archive of the "
"hosts file.")
parser.add_argument("--noupdate", "-n", dest="noupdate", default=False,
action="store_true", help="Don't update from "
"host data sources.")
@@ -182,13 +176,6 @@ def main():
skipstatichosts=skip_static_hosts)
final_file.close()
if settings["ziphosts"]:
zf = zipfile.ZipFile(path_join_robust(output_subfolder,
"hosts.zip"), mode='w')
zf.write(path_join_robust(output_subfolder, "hosts"),
compress_type=zipfile.ZIP_DEFLATED, arcname='hosts')
zf.close()
update_readme_data(settings["readmedatafilename"],
extensions=extensions,
numberofrules=number_of_rules,