Merge remote-tracking branch 'upstream/master'

autoProcessTV/autoProcessTV.py

@@ -59,7 +59,7 @@ def processEpisode(dirName, nzbName=None):
     password = config.get("SickBeard", "password")
     try:
         ssl = int(config.get("SickBeard", "ssl"))
-    except ConfigParser.NoOptionError, ValueError:
+    except (ConfigParser.NoOptionError, ValueError):
         ssl = 0
     
     try:

sickbeard/notifiers/notifo.py

@@ -42,7 +42,7 @@ class NotifoNotifier:
         data = urllib.urlencode({
             "title": title,
             "label": label,
-            "msg": msg
+            "msg": msg.encode(sickbeard.SYS_ENCODING)
         })
 
         try:

sickbeard/notifiers/xbmc.py

@@ -103,7 +103,7 @@ class XBMCNotifier:
     
             logger.log(u"Contacting XBMC via url: " + url, logger.DEBUG)
             handle = urllib2.urlopen(req)
-            response = handle.read()
+            response = handle.read().decode(sickbeard.SYS_ENCODING)
             logger.log(u"response: " + response, logger.DEBUG)
         except IOError, e:
             logger.log(u"Warning: Couldn't contact XBMC HTTP server at " + fixStupidEncodings(host) + ": " + ex(e))
@@ -191,7 +191,7 @@ class XBMCNotifier:
     
             for path in paths:
                 # Don't need it double-encoded, gawd this is dumb
-                unEncPath = urllib.unquote(path.text)
+                unEncPath = urllib.unquote(path.text).decode(sickbeard.SYS_ENCODING)
                 logger.log(u"XBMC Updating " + showName + " on " + host + " at " + unEncPath, logger.DEBUG)
                 updateCommand = {'command': 'ExecBuiltIn', 'parameter': 'XBMC.updatelibrary(video, %s)' % (unEncPath)}
                 request = self._sendToXBMC(updateCommand, host)