git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@189
fdd5c36f-1aea-0310-aeeb-
c58d7e2b6c23
charsets = [universal_charset, DEFAULT_CHARSET]
if charset:
charsets = [universal_charset, DEFAULT_CHARSET]
if charset:
- charset = charset.lower()
+ charset = charset.lower().replace("windows-", "cp")
if charset not in charsets:
charsets.insert(0, charset)
if charset not in charsets:
charsets.insert(0, charset)
parser.charset = DEFAULT_CHARSET
if parser.charset:
parser.charset = DEFAULT_CHARSET
if parser.charset:
- parser.charset = parser.charset.replace("windows-", "cp").lower()
+ parser.charset = parser.charset.lower().replace("windows-", "cp")
if parser.charset and (parser.charset <> universal_charset):
try:
if parser.meta_charset:
if log: log(" META charset : %s" % parser.charset)
if parser.charset and (parser.charset <> universal_charset):
try:
if parser.meta_charset:
if log: log(" META charset : %s" % parser.charset)
+ elif (not charset) or charset <> parser.charset:
if log: log(" guessed charset: %s" % parser.charset)
if log: log(" current charset: %s" % universal_charset)
if log: log(" title : %s" % title)
if log: log(" guessed charset: %s" % parser.charset)
if log: log(" current charset: %s" % universal_charset)
if log: log(" title : %s" % title)