Moved DEFAULT_CHARSET to bkmk_objects.py.

[bookmarks_db.git] / bkmk_parser.py

diff --git a/bkmk_parser.py b/bkmk_parser.py
index 02b20d780c56003aea95d30827e4a8d85e6c4ef4..90b33b37a711a415e2611776f3646ae721318250 100644 (file)
--- a/bkmk_parser.py
+++ b/bkmk_parser.py
@@ -15,7 +15,7 @@ __all__ = ['BkmkParser']
 
 import sys, os
 from m_lib.net.www.html import HTMLParser
-from bkmk_objects import Folder, Bookmark, Ruler
+from bkmk_objects import DEFAULT_CHARSET, Folder, Bookmark, Ruler
 
 
 DEBUG = os.environ.has_key("BKMK_DEBUG")
@@ -37,11 +37,6 @@ else:
    dump_names = debug
 
 
-try:
-    from m_lib.defenc import default_encoding as DEFAULT_CHARSET
-except ImportError:
-    DEFAULT_CHARSET = None
-
 class BkmkParser(HTMLParser):
    def __init__(self):
       HTMLParser.__init__(self)