From: Oleg Broytman <phd@phdru.name>
Date: Thu, 14 Apr 2011 15:23:14 +0000 (+0000)
Subject: m_lib.defenc is always available.
X-Git-Tag: v4.5.3~44
X-Git-Url: https://git.phdru.name/?p=bookmarks_db.git;a=commitdiff_plain;h=68601d0cc97e734da6e29a0af39a834e4c3a34f1

m_lib.defenc is always available.


git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@332 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23
---

diff --git a/bkmk_parser.py b/bkmk_parser.py
index 02b20d7..86b6280 100644
--- 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,11 +38,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)