X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_parser.py;h=02b20d780c56003aea95d30827e4a8d85e6c4ef4;hb=97aa08d47caad9eb70df496aa65e63b57b9cd5b6;hp=2ec412c012c2e1c385bad0ad60349bdbb89e6f6f;hpb=832eb757ef7f81abf1e431ce16f368c10dd57962;p=bookmarks_db.git

diff --git a/bkmk_parser.py b/bkmk_parser.py
index 2ec412c..02b20d7 100644
--- a/bkmk_parser.py
+++ b/bkmk_parser.py
@@ -10,6 +10,9 @@ __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 1997-2011 PhiloSoft Design"
 __license__ = "GNU GPL"
 
+__all__ = ['BkmkParser']
+
+
 import sys, os
 from m_lib.net.www.html import HTMLParser
 from bkmk_objects import Folder, Bookmark, Ruler
@@ -34,7 +37,10 @@ else:
    dump_names = debug
 
 
-DEFAULT_CHARSET = None
+try:
+    from m_lib.defenc import default_encoding as DEFAULT_CHARSET
+except ImportError:
+    DEFAULT_CHARSET = None
 
 class BkmkParser(HTMLParser):
    def __init__(self):
@@ -43,17 +49,15 @@ 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
 
-
    # Mozilla - get charset
    def do_meta(self, attrs):
       http_equiv = ""
@@ -72,17 +76,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:
@@ -92,7 +85,6 @@ class BkmkParser(HTMLParser):
    def end_title(self):
       self.accumulator += "</TITLE>"
 
-
    # Start root folder
    def start_h1(self, attrs):
       root_folder = Folder()
@@ -111,7 +103,6 @@ class BkmkParser(HTMLParser):
       debug("Root folder name: `%s'" % accumulator)
       self.root_folder.name = accumulator
 
-
    # Start a folder
    def start_h3(self, attrs):
       last_modified = None
@@ -137,7 +128,6 @@ class BkmkParser(HTMLParser):
       debug("Folder name: `%s'" % accumulator)
       self.current_folder.name = accumulator
 
-
    # Start a bookmark
    def start_a(self, attrs):
       add_date = None
@@ -180,7 +170,6 @@ class BkmkParser(HTMLParser):
       bookmark = self.current_folder[-1]
       bookmark.name = accumulator
 
-
    def flush(self):
       accumulator = self.accumulator
 
@@ -192,13 +181,11 @@ class BkmkParser(HTMLParser):
             current_object.comment += accumulator.strip()
             debug("Comment: `%s'" % current_object.comment)
 
-
    def start_dl(self, attrs):
       self.flush()
 
    do_dt = start_dl
 
-
    # End of folder
    def end_dl(self):
       self.flush()
@@ -214,19 +201,16 @@ class BkmkParser(HTMLParser):
          debug("FOLDER STACK is EMPTY!!! (2)")
       self.current_object = None
 
-
    def close(self):
       HTMLParser.close(self)
       if self.folder_stack:
          raise ValueError, "wrong folder stack: %s" % self.folder_stack
 
-
    def do_dd(self, attrs):
       pass
 
    do_p = do_dd
 
-
    # Start ruler
    def do_hr(self, attrs):
       self.flush()
@@ -235,17 +219,14 @@ class BkmkParser(HTMLParser):
       self.current_object = None
       self.objects += 1
 
-
    # BR in comment
    def do_br(self, attrs):
       self.accumulator += "<BR>"
 
-
    # Allow < in the text
    def unknown_starttag(self, tag, attrs):
       self.accumulator += "<%s>" % tag
 
-
    # Do not allow unknow end tags
    def unknown_endtag(self, tag):
       raise NotImplementedError("Unknow end tag `%s'" % tag)