From 85ca549fabf298dd87ae34b4779604bad8efbe5b Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 15 Feb 2019 19:39:27 +0100 Subject: condition order fix * fixed condition order to prevent NoneType errors * fixed readline to read --- main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index ae5f562..c9deb83 100644 --- a/main.py +++ b/main.py @@ -32,12 +32,12 @@ class BlacklistImporter: head = s.head(self.url) etag = head.headers['etag'] - # if file is present - if os.path.isfile("blacklist.txt"): - # if etags match up or if a connection is not possible fall back to local cache - if local_etag == etag or head.status_code != 200: + # if etags match up or if a connection is not possible fall back to local cache + if local_etag == etag or head.status_code != 200: + # check if local cache is present + if os.path.isfile("blacklist.txt"): with open("blacklist.txt", "r", encoding="utf-8") as file: - self.blacklist = file.readline() + self.blacklist = file.read() # in any other case request a new file else: -- cgit v1.2.3-54-g00ecf