Revert "we shouldn't encode to utf8 when unquoting"

This reverts commit 2dd28d86a2.
This commit is contained in:
Damien Elmes 2014-08-05 12:58:14 +09:00
parent 0914c01706
commit 08510a4a53

View file

@ -222,16 +222,17 @@ create table meta (dirMod int, lastUsn int); insert into meta values (0, 0);
return txt return txt
def escapeImages(self, string, unescape=False): def escapeImages(self, string, unescape=False):
if unescape:
fn = urllib.unquote
else:
fn = urllib.quote
def repl(match): def repl(match):
tag = match.group(0) tag = match.group(0)
fname = match.group("fname") fname = match.group("fname")
if re.match("(https?|ftp)://", fname): if re.match("(https?|ftp)://", fname):
return tag return tag
if unescape: return tag.replace(
txt = urllib.unquote(fname) fname, fn(fname.encode("utf-8")))
else:
txt = urllib.quote(fname.encode("utf-8"))
return tag.replace(fname, txt)
for reg in self.imgRegexps: for reg in self.imgRegexps:
string = re.sub(reg, repl, string) string = re.sub(reg, repl, string)
return string return string