From 998049a39d3df613d499fac726eb88f99c0c99f4 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 9 Mar 2015 16:07:05 +0100 Subject: [PATCH] Python 2.6 parseerror fix #4701 --- couchpotato/core/media/_base/providers/base.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/couchpotato/core/media/_base/providers/base.py b/couchpotato/core/media/_base/providers/base.py index 1062a1a..642d477 100644 --- a/couchpotato/core/media/_base/providers/base.py +++ b/couchpotato/core/media/_base/providers/base.py @@ -5,6 +5,11 @@ import time import traceback import xml.etree.ElementTree as XMLTree +try: + from xml.etree.ElementTree import ParseError as XmlParseError +except ImportError: + from xml.parsers.expat import ExpatError as XmlParseError + from couchpotato.core.event import addEvent, fireEvent from couchpotato.core.helpers.encoding import ss from couchpotato.core.helpers.variable import tryFloat, mergeDicts, md5, \ @@ -94,7 +99,7 @@ class Provider(Plugin): try: data = XMLTree.fromstring(ss(data)) return self.getElements(data, item_path) - except XMLTree.ParseError: + except XmlParseError: log.error('Invalid XML returned, check "%s" manually for issues', url) except: log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))