From 08510a4a5378e1bb0a2eb94efc334371223fab69 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 5 Aug 2014 12:58:14 +0900 Subject: [PATCH] Revert "we shouldn't encode to utf8 when unquoting" This reverts commit 2dd28d86a224ee4ed8852b1f1738b9ad34a2e7b1. --- anki/media.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/anki/media.py b/anki/media.py index 00971b729..d19295e99 100644 --- a/anki/media.py +++ b/anki/media.py @@ -222,16 +222,17 @@ create table meta (dirMod int, lastUsn int); insert into meta values (0, 0); return txt def escapeImages(self, string, unescape=False): + if unescape: + fn = urllib.unquote + else: + fn = urllib.quote def repl(match): tag = match.group(0) fname = match.group("fname") if re.match("(https?|ftp)://", fname): return tag - if unescape: - txt = urllib.unquote(fname) - else: - txt = urllib.quote(fname.encode("utf-8")) - return tag.replace(fname, txt) + return tag.replace( + fname, fn(fname.encode("utf-8"))) for reg in self.imgRegexps: string = re.sub(reg, repl, string) return string