m_lib.defenc is always available.

[bookmarks_db.git] / bkmk_parser.py

diff --git a/bkmk_parser.py b/bkmk_parser.py
index e3b3db02532567aef8060c4546f1f3a6af6039e2..86b62809679fb99ab5c9316b59713825d8170081 100644 (file)
--- a/bkmk_parser.py
+++ b/bkmk_parser.py
@@ -14,6 +14,7 @@ __all__ = ['BkmkParser']
 
 
 import sys, os
+from m_lib.defenc import default_encoding as DEFAULT_CHARSET
 from m_lib.net.www.html import HTMLParser
 from bkmk_objects import Folder, Bookmark, Ruler
 
@@ -37,8 +38,6 @@ else:
    dump_names = debug
 
 
-DEFAULT_CHARSET = None
-
 class BkmkParser(HTMLParser):
    def __init__(self):
       HTMLParser.__init__(self)
@@ -46,12 +45,12 @@ class BkmkParser(HTMLParser):
       self.urls = 0
       self.objects = 0
 
-      self.charset = ""
+      self.charset = None
       self.recode = None
 
    def handle_data(self, data):
       if data:
-         if DEFAULT_CHARSET:
+         if self.charset and DEFAULT_CHARSET:
             data = unicode(data, self.charset, "replace").encode(DEFAULT_CHARSET, "xmlcharrefreplace")
          self.accumulator += data
 
@@ -73,16 +72,6 @@ class BkmkParser(HTMLParser):
             self.charset = content.split('=')[1]
          except IndexError:
             pass
-         else:
-            global DEFAULT_CHARSET
-            DEFAULT_CHARSET = sys.getdefaultencoding()
-            if DEFAULT_CHARSET == "ascii":
-               try:
-                  import locale
-               except ImportError:
-                  pass
-               else:
-                  DEFAULT_CHARSET = locale.getpreferredencoding()
 
    def start_title(self, attrs):
       if DEFAULT_CHARSET: