pictuga
/
morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Remove HTTPError code 

Only used to look nice but useless (inherits from IOError anyway)
master
pictuga 2017-03-18 23:39:32 -10:00
parent 99f3c519f2
commit d4937812a8
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
morss/morss.py
View File

@ -25,13 +25,11 @@ from html2text import HTML2Text
try: try:
from Queue import Queue from Queue import Queue
from httplib import HTTPException from httplib import HTTPException
from urllib2 import HTTPError
from urllib import quote_plus from urllib import quote_plus
from urlparse import urlparse, urljoin, parse_qs from urlparse import urlparse, urljoin, parse_qs
except ImportError: except ImportError:
from queue import Queue from queue import Queue
from http.client import HTTPException from http.client import HTTPException
from urllib.error import HTTPError
from urllib.parse import quote_plus from urllib.parse import quote_plus
from urllib.parse import urlparse, urljoin, parse_qs from urllib.parse import urlparse, urljoin, parse_qs
@ -354,9 +352,6 @@ def FeedFetch(url, options):
con = crawler.custom_handler('xml', True, delay, options.encoding).open(url, timeout=TIMEOUT * 2) con = crawler.custom_handler('xml', True, delay, options.encoding).open(url, timeout=TIMEOUT * 2)
xml = con.read() xml = con.read()
except (HTTPError) as e:
raise MorssException('Error downloading feed (HTTP Error %s)' % e.code)
except (IOError, HTTPException): except (IOError, HTTPException):
raise MorssException('Error downloading feed') raise MorssException('Error downloading feed')