Support older dreamboxes (e.g. 7025+) that don't have a recent elementtree library.

diff --git a/ChangeLog b/ChangeLog
index efd72ff0deb6d92200cbc6a8fbc3b4f68869296a..840e7de364a0fa90656f13d8c7a5757c9926a6e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-30  Christian Weiske  <cweiske@cweiske.de>
+
+       * Support older dreamboxes (e.g. 7025+) that don't have a
+         recent elementtree library.
+

 2013-09-02  Christian Weiske  <cweiske@cweiske.de>
 
        * Add support for loading local files via "file://" URLs
 2013-09-02  Christian Weiske  <cweiske@cweiske.de>
 
        * Add support for loading local files via "file://" URLs

diff --git a/src/AtomFeed.py b/src/AtomFeed.py
index eff3eaad74f0ea48357abef5716531433271b828..f99d10526aa12dede451796252620fda2a603ef8 100644 (file)
--- a/src/AtomFeed.py
+++ b/src/AtomFeed.py
@@ -4,7 +4,7 @@
 # License: GPLv3 or later
 
 from twisted.web.client import getPage
 # License: GPLv3 or later
 
 from twisted.web.client import getPage

-from xml.etree.cElementTree import fromstring, ParseError
+from xml.etree.cElementTree import fromstring

 
 import os
 
 
 import os
 


@@ -35,7 +35,7 @@ class AtomFeed:
         """ Parse atom feed data into pages list and run callback """
         try:
             xml = fromstring(data)
         """ Parse atom feed data into pages list and run callback """
         try:
             xml = fromstring(data)

-        except ParseError:
+        except Exception:

             return self.errorCallback("Invalid XML")
 
         pages = []
             return self.errorCallback("Invalid XML")
 
         pages = []