diff --git a/morss.py b/morss.py index f1c52d1..243e150 100644 --- a/morss.py +++ b/morss.py @@ -341,7 +341,7 @@ def Fill(item, cache, feedurl='/', fast=False): url = item.link.encode('utf-8') con = urllib2.build_opener(HTMLDownloader()).open(url, timeout=TIMEOUT) data = con.read() - except (urllib2.HTTPError, urllib2.URLError, socket.timeout) as error: + except (urllib2.HTTPError, urllib2.URLError, httplib.HTTPException, socket.timeout) as error: log('http error') cache.set(item.link, 'error-http') return True @@ -379,7 +379,7 @@ def Gather(url, cachePath, progress=False): cache.set(url, xml) cache.set('etag', con.headers.getheader('etag')) cache.set('lastmodified', con.headers.getheader('last-modified')) - except (urllib2.HTTPError, urllib2.URLError): + except (urllib2.HTTPError, urllib2.URLError, httplib.HTTPException): return False rss = feeds.parse(xml)