Merge pull request midgetspy#352 from itofzo/fix_keyword_search

Fix keywords search Exception for adding new shows
Terafloppy · Apr 10, 2012 · bbb3325 · bbb3325
2 parents 552219c + 555754c
commit bbb3325
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
@@ -1581,11 +1581,12 @@ def searchTVDBForShowName(self, name, lang="en"):
 
             try:
                 seriesXML = etree.ElementTree(etree.XML(urlData))
-            except Exception, e:
-                logger.log(u"Unable to parse XML for some reason: "+ex(e)+" from XML: "+urlData, logger.ERROR)
-                return ''
+                series = seriesXML.getiterator('Series')
 
-            series = seriesXML.getiterator('Series')
+            except Exception, e:
+                # use finalURL in log, because urlData can be too much information
+                logger.log(u"Unable to parse XML for some reason: "+ex(e)+" from XML: "+finalURL, logger.ERROR)
+                series = ''
 
             # add each result to our list
             for curSeries in series: