Merge branch 'hotfix-3293'

lib/tvdb_api/tvdb_api.py

@@ -22,8 +22,9 @@ import logging
 import zipfile
 import datetime as dt
 import requests
-from requests import exceptions
+
 import xmltodict
+import HTMLParser
 
 try:
     import xml.etree.cElementTree as ElementTree
@@ -617,12 +618,12 @@ class Tvdb:
                 zipdata = StringIO.StringIO()
                 zipdata.write(resp.content)
                 myzipfile = zipfile.ZipFile(zipdata)
-                return xmltodict.parse(myzipfile.read('%s.xml' % language).replace(' ',' '), postprocessor=process)
+                return xmltodict.parse(HTMLParser.HTMLParser().unescape(myzipfile.read('%s.xml' % language)), postprocessor=process)
             except zipfile.BadZipfile:
                 raise tvdb_error("Bad zip file received from thetvdb.com, could not read it")
         else:
             try:
-                return xmltodict.parse(resp.content.decode('utf-8').replace(' ',' '), postprocessor=process)
+                return safe_xmltodict.parse(HTMLParser.HTMLParser().unescape(resp.text), postprocessor=process)
             except:
                 return dict([(u'data', None)])
 

sickbeard/providers/extratorrent.py

@@ -19,9 +19,11 @@
 import re
 import traceback
 import datetime
-import sickbeard
+
 import xmltodict
+import HTMLParser
 
+import sickbeard
 from sickbeard.providers import generic
 from sickbeard.common import Quality
 from sickbeard import logger
@@ -81,7 +83,7 @@ class ExtraTorrentProvider(generic.TorrentProvider):
 
                     try:
                         # Must replace non-breaking space, as there is no xml DTD
-                        data = xmltodict.parse(data.replace(' ',' '))
+                        data = xmltodict.parse(HTMLParser.HTMLParser().unescape(data))
                     except ExpatError as e:
                         logger.log(u"Failed parsing provider. Traceback: %r\n%r" % (traceback.format_exc(), data), logger.ERROR)
                         continue

sickbeard/providers/kat.py

@@ -20,11 +20,13 @@
 from __future__ import with_statement
 
 import traceback
-import re
+
 import datetime
-import xmltodict
 from urllib import urlencode
 
+import xmltodict
+import HTMLParser
+
 import sickbeard
 from sickbeard import logger
 from sickbeard import tvcache
@@ -35,7 +37,6 @@ from sickbeard.common import Quality
 from sickbeard.common import USER_AGENT
 from sickbeard.providers import generic
 from xml.parsers.expat import ExpatError
-from sickbeard.show_name_helpers import allPossibleShowNames, sanitizeSceneName
 
 class KATProvider(generic.TorrentProvider):
     def __init__(self):
@@ -96,8 +97,7 @@ class KATProvider(generic.TorrentProvider):
                         continue
 
                     try:
-                        # Must replace non-breaking space, as there is no xml DTD
-                        data = xmltodict.parse(data.replace(' ',' '))
+                        data = xmltodict.parse(HTMLParser.HTMLParser().unescape(data))
                     except ExpatError as e:
                         logger.log(u"Failed parsing provider. Traceback: %r\n%r" % (traceback.format_exc(), data), logger.ERROR)
                         continue