]
-import os, cgi
-from m_lib.defenc import default_encoding as DEFAULT_CHARSET
+import os, urllib
BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
isBookmark = 1
def __init__(self, href, add_date, last_visit=None, last_modified=None,
- keyword=None, comment='', icon_href=None, icon=None, charset=None):
+ keyword=None, comment='', icon_href=None, icon=None,
+ charset=None, parser_charset=None):
+ protocol, request = urllib.splittype(href)
+ user, password, port = None, None, None
+ host, path = urllib.splithost(request)
+ if host:
+ user, host = urllib.splituser(host)
+ if user:
+ user, password = urllib.splitpasswd(user)
+ host, port = urllib.splitport(host)
+ if port: port = int(port)
+
+ href = protocol + "://"
+ if user:
+ href += urllib.quote(user)
+ if password:
+ href += ':' + urllib.quote(password)
+ href += '@'
+ if host:
+ href += host.decode(parser_charset or 'utf-8').encode('idna')
+ if port:
+ href += ':%d' % port
+ if path:
+ href += path
+
self.href = href
self.add_date = add_date
self.last_visit = last_visit
def unquote_title(title):
if BKMK_FORMAT == "MOZILLA":
from HTMLParser import HTMLParser
- title = HTMLParser().unescape(title.replace("&", '&'))
- title = title.replace("'", "'")
+ title = HTMLParser().unescape(title.replace("&", '&').decode('utf-8'))
+ title = title.encode('utf-8').replace("'", "'")
return title