From 1e2f258f40c74803df6746e7b6041776ba715f4b Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Thu, 14 Apr 2011 15:25:28 +0000 Subject: [PATCH] Moved DEFAULT_CHARSET to bkmk_objects.py. git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@333 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23 --- bkmk_objects.py | 3 ++- bkmk_parser.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bkmk_objects.py b/bkmk_objects.py index 27e621b..19595a1 100644 --- a/bkmk_objects.py +++ b/bkmk_objects.py @@ -17,8 +17,9 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot', import os, cgi -BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA") +from m_lib.defenc import default_encoding as DEFAULT_CHARSET +BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA") class Folder(list): isFolder = 1 diff --git a/bkmk_parser.py b/bkmk_parser.py index 86b6280..90b33b3 100644 --- a/bkmk_parser.py +++ b/bkmk_parser.py @@ -14,9 +14,8 @@ __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 +from bkmk_objects import DEFAULT_CHARSET, Folder, Bookmark, Ruler DEBUG = os.environ.has_key("BKMK_DEBUG") -- 2.39.5