starred/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2026-10-06 06:14:48 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Review of domain_to_idna()

Browse Source 
This patch review the way we get the comment at the end of a line.
I also did an application of DRY (Do not Repeat Yourself)
and/or KISS (Keep It Simple, Stupid) by refactoring the 2 `else`
statements into one line.
This commit is contained in:
funilrys
2018-03-02 22:07:11 +01:00
parent 8f00cb4d76
commit 780e47ffe5
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updateHostsFile.py
+12 -14
View File
@@ -1161,27 +1161,25 @@ def domain_to_idna(line):
""" """
if not line.startswith('#'): if not line.startswith('#'):
for separator in [' ', '\t']: for separator in ['\t', ' ']:
comment_to_append = '' comment = ''
if separator in line: if separator in line:
splited_line = line.split(separator) splited_line = line.split(separator)
if '#' in splited_line[1]: if '#' in splited_line[1]:
comment_to_append = splited_line[1].split('#')[1] index_comment = splited_line[1].find('#')
if index_comment > -1:
comment = splited_line[1][index_comment:]
if comment_to_append:
splited_line[1] = splited_line[1] \ splited_line[1] = splited_line[1] \
.split(comment_to_append)[0] \ .split(comment)[0] \
.encode("IDNA").decode("UTF-8") + \ .encode("IDNA").decode("UTF-8") + \
'#' + comment_to_append[1] comment
else:
splited_line[1] = splited_line[1] \ splited_line[1] = splited_line[1] \
.encode("IDNA") \ .encode("IDNA") \
.decode("UTF-8") .decode("UTF-8")
else:
splited_line[1] = splited_line[1] \
.encode("IDNA") \
.decode("UTF-8")
return separator.join(splited_line) return separator.join(splited_line)
return line.encode("IDNA").decode("UTF-8") return line.encode("IDNA").decode("UTF-8")
return line.encode("UTF-8").decode("UTF-8") return line.encode("UTF-8").decode("UTF-8")