Moved DEFAULT_CHARSET to bkmk_objects.py.

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

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 27e621b898ba4cf89499aea7e49943a9915974dd..19595a1a94bae2ed7a4b59ff50d6d1563643d8fd 100644 (file)
--- 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 86b62809679fb99ab5c9316b59713825d8170081..90b33b37a711a415e2611776f3646ae721318250 100644 (file)
--- 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")