Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-02 17:29:22 +01:00
Code Issues Projects Releases Wiki Activity

utils/web.py: Only try catching socket.sslerror if built with SSL support

Browse Source 
Closes: Sf#2998820

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit f03a3f6c85)
This commit is contained in:
James Vega 2010-05-24 15:44:25 -04:00
parent 246e09cc99
commit a6857ce9bf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/web.py
View File

@ -36,6 +36,12 @@ import sgmllib
import urlparse import urlparse
import htmlentitydefs import htmlentitydefs
sockerrors = (socket.error,)
try:
sockerrors += (socket.sslerror,)
except AttributeError:
pass
from str import normalizeWhitespace from str import normalizeWhitespace
Request = urllib2.Request Request = urllib2.Request
@ -106,7 +112,7 @@ def getUrlFd(url, headers=None):
return fd return fd
except socket.timeout, e: except socket.timeout, e:
raise Error, TIMED_OUT raise Error, TIMED_OUT
except (socket.error, socket.sslerror), e: except sockerrors, e:
raise Error, strError(e) raise Error, strError(e)
except httplib.InvalidURL, e: except httplib.InvalidURL, e:
raise Error, 'Invalid URL: %s' % e raise Error, 'Invalid URL: %s' % e