From e02a66d3f73c80b48630169b950c8298a65a7c58 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Thu, 30 Jan 2014 20:32:27 +0100
Subject: [PATCH] Support older dreamboxes (e.g. 7025+) that don't have a
 recent elementtree library.

---
 ChangeLog       | 5 +++++
 src/AtomFeed.py | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efd72ff..840e7de 100644
--- 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
diff --git a/src/AtomFeed.py b/src/AtomFeed.py
index eff3eaa..f99d105 100644
--- a/src/AtomFeed.py
+++ b/src/AtomFeed.py
@@ -4,7 +4,7 @@
 # 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
 
@@ -35,7 +35,7 @@ class AtomFeed:
         """ Parse atom feed data into pages list and run callback """
         try:
             xml = fromstring(data)
-        except ParseError:
+        except Exception:
             return self.errorCallback("Invalid XML")
 
         pages = []
-- 
2.30.2