condition order fix

* fixed condition order to prevent NoneType errors
* fixed readline to read
This commit is contained in:
nico 2019-02-15 19:39:27 +01:00
parent e9208a8277
commit 85ca549fab
Signed by: mightyBroccoli
GPG Key ID: EA7C31AAB1BDC1A2
1 changed files with 5 additions and 5 deletions

10
main.py
View File

@ -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: