Move charset to the beginning of the list.

[bookmarks_db.git] / Robots / parse_html.py

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index cc7655bfa950770d3f092ad7c32d387f2f65bd8b..347ed225ecee372695abdea8db686ad96a77971f 100755 (executable)
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -13,11 +13,11 @@ DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic
 parsers = []
 
 try:
-   import parse_html_etreetidy
+   import parse_html_html5
 except ImportError:
    pass
 else:
-   parsers.append(parse_html_etreetidy.parse_html)
+   parsers.append(parse_html_html5.parse_html)
 
 try:
    import parse_html_beautifulsoup
@@ -70,8 +70,9 @@ def parse_html(filename, charset=None, log=None):
    charsets = [universal_charset, DEFAULT_CHARSET]
    if charset:
       charset = charset.lower().replace("windows-", "cp")
-      if charset not in charsets:
-         charsets.insert(0, charset)
+      if charset in charsets:
+         charsets.remove(charset)
+      charsets.insert(0, charset)
 
    for p in parsers:
       parser = None