Merge tag 'v3.9.2' into develop

Tagging version v3.9.2 v3.9.2
2014-11-26 07:49:18 -08:00 · 2014-11-26 07:49:18 -08:00 · fd03e0394d
parent b71dc36801 e31db53592
commit fd03e0394d
1 changed files with 2 additions and 2 deletions
--- a/sickbeard/exceptions.py
+++ b/sickbeard/exceptions.py
@ -32,11 +32,11 @@ def ex(e):

        if arg is not None:
            if isinstance(arg, (str, unicode)):
-                fixed_arg = toUnicode(arg, True)
+                fixed_arg = toUnicode(arg)

            else:
                try:
-                    fixed_arg = u"error " + toUnicode(str(arg), True)
+                    fixed_arg = u"error " + toUnicode(str(arg))

                except:
                    fixed_arg = None