Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Open files in mode utf8

Browse Source
This commit is contained in:
VirtuBox
2019-09-01 22:02:52 +02:00
parent 0ee116bd6c
commit 1e6d41d3d8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wo/cli/plugins/site_functions.py
View File

@@ -1486,7 +1486,7 @@ def checkWildcardExist(self, wo_domain_name):
# define new csv dialect # define new csv dialect
csv.register_dialect('acmeconf', delimiter='|') csv.register_dialect('acmeconf', delimiter='|')
# open file # open file
certfile = open('/var/lib/wo/cert.csv', 'rt') certfile = open('/var/lib/wo/cert.csv', mode='rt', encoding='utf-8')
reader = csv.reader(certfile, 'acmeconf') reader = csv.reader(certfile, 'acmeconf')
wo_wildcard_domain = ("*.{0}".format(wo_domain_name)) wo_wildcard_domain = ("*.{0}".format(wo_domain_name))
for row in reader: for row in reader:

3
wo/core/domainvalidate.py
View File

@@ -32,10 +32,11 @@ def GetDomainlevel(domain):
domain_name = domain.split('.') domain_name = domain.split('.')
if domain_name[0] == 'www': if domain_name[0] == 'www':
domain_name = domain_name[1:] domain_name = domain_name[1:]
domain_type = ''
if os.path.isfile("/var/lib/wo/public_suffix_list.dat"): if os.path.isfile("/var/lib/wo/public_suffix_list.dat"):
# Read mode opens a file for reading only. # Read mode opens a file for reading only.
Suffix_file = open( Suffix_file = open(
"/var/lib/wo/public_suffix_list.dat", "r") "/var/lib/wo/public_suffix_list.dat", mode='rt', encoding='utf-8')
# Read all the lines into a list. # Read all the lines into a list.
for domain_suffix in Suffix_file: for domain_suffix in Suffix_file:
if (str(domain_suffix).strip()) == ('.'.join(domain_name[1:])): if (str(domain_suffix).strip()) == ('.'.join(domain_name[1:])):