From a47d396f1857f17e48bda8bea6641028efc3da87 Mon Sep 17 00:00:00 2001 From: Dustyn Gibson <miigotu@gmail.com> Date: Fri, 24 Jul 2015 16:46:16 -0700 Subject: [PATCH] Reorder other decoding methods also --- sickbeard/encodingKludge.py | 13 ++++++++----- sickbeard/webserve.py | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sickbeard/encodingKludge.py b/sickbeard/encodingKludge.py index 04a2ec27d..622cfc8ab 100644 --- a/sickbeard/encodingKludge.py +++ b/sickbeard/encodingKludge.py @@ -26,16 +26,19 @@ def _toUnicode(x): x = unicode(x) except Exception: try: - x = unicode(x, sickbeard.SYS_ENCODING) + x = unicode(x, 'utf-8') except Exception: try: - x = unicode(x, 'utf-8') + x = unicode(x, 'latin-1') except Exception: try: - x = unicode(x, 'latin-1') + x = unicode(x, sickbeard.SYS_ENCODING) except Exception: - # Chardet can be wrong, so try it last - x = unicode(x, chardet.detect(x).get('encoding')) + try: + # Chardet can be wrong, so try it last + x = unicode(x, chardet.detect(x).get('encoding')) + except Exception: + x = unicode(x, sickbeard.SYS_ENCODING, 'replace') return x def ss(x): diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index e08d1da04..ffa29e2d5 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -96,13 +96,13 @@ class html_entities(CheetahFilter): filtered = unicode(val) except Exception: try: - filtered = unicode(val, sickbeard.SYS_ENCODING) + filtered = unicode(val, 'utf-8') except Exception: try: - filtered = unicode(val, 'utf-8') + filtered = unicode(val, 'latin-1') except Exception: try: - filtered = unicode(val, 'latin-1') + filtered = unicode(val, sickbeard.SYS_ENCODING) except Exception: logger.log(u'Unable to decode using %s, utf-8, or latin-1. Falling back to chardet!' % sickbeard.SYS_ENCODING, logger.ERROR) -- GitLab