From 2d3fc03a0047f2c72a312af7f37671c760805252 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 21 Sep 2013 13:56:17 +0200 Subject: [PATCH] Revert back to UTF8 when ss encoding fails. fix #2220 --- couchpotato/core/helpers/encoding.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/helpers/encoding.py b/couchpotato/core/helpers/encoding.py index 6e864446..5fa2e2ad 100644 --- a/couchpotato/core/helpers/encoding.py +++ b/couchpotato/core/helpers/encoding.py @@ -38,8 +38,14 @@ def toUnicode(original, *args): return toUnicode(ascii_text) def ss(original, *args): - from couchpotato.environment import Env - return toUnicode(original, *args).encode(Env.get('encoding')) + + u_original = toUnicode(original, *args) + try: + from couchpotato.environment import Env + return u_original.encode(Env.get('encoding')) + except Exception, e: + log.debug('Failed ss encoding char, force UTF8: %s', e) + return u_original.encode('UTF-8') def ek(original, *args): if isinstance(original, (str, unicode)):