Marown/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2024-07-02 18:45:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Review of domain_to_idna() to support more tests cases

Browse Source 
Please note this patch comes after an issue reported by @FadeMind
which I could reproduce in 1/3 computer.
This commit is contained in:
funilrys 2018-03-04 11:17:38 +01:00
parent cf130d092c
commit 8405f87edb
No known key found for this signature in database
GPG Key ID: 0D8BFEF5515C00C6
1 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
updateHostsFile.py
View File

@ -1159,26 +1159,47 @@ def domain_to_idna(line):
"""
if not line.startswith('#'):
for separator in ['\t', ' ']:
comment = ''
tabs = '\t'
space = ' '
if separator in line:
splited_line = line.split(separator)
if '#' in splited_line[1]:
index_comment = splited_line[1].find('#')
tabs_position, space_position = (line.find(tabs), line.find(space))
if index_comment > -1:
comment = splited_line[1][index_comment:]
if tabs_position > -1 and space_position > -1:
if space_position < tabs_position:
separator = space
else:
separator = tabs
elif not tabs_position == -1:
separator = tabs
elif not space_position == -1:
separator = space
else:
separator = ''
splited_line[1] = splited_line[1] \
.split(comment)[0] \
.encode("IDNA").decode("UTF-8") + \
comment
if separator:
splited_line = line.split(separator)
splited_line[1] = splited_line[1] \
.encode("IDNA") \
.decode("UTF-8")
return separator.join(splited_line)
index = 1
while index < len(splited_line):
if splited_line[index]:
break
index += 1
if '#' in splited_line[index]:
index_comment = splited_line[index].find('#')
if index_comment > -1:
comment = splited_line[index][index_comment:]
splited_line[index] = splited_line[index] \
.split(comment)[0] \
.encode("IDNA").decode("UTF-8") + \
comment
splited_line[index] = splited_line[index] \
.encode("IDNA") \
.decode("UTF-8")
return separator.join(splited_line)
return line.encode("IDNA").decode("UTF-8")
return line.encode("UTF-8").decode("UTF-8")