From a6857ce9bf4a9f25cd7a6fd0005793b64f7c67dd Mon Sep 17 00:00:00 2001
From: James Vega <jamessan@users.sourceforge.net>
Date: Mon, 24 May 2010 15:44:25 -0400
Subject: [PATCH] utils/web.py: Only try catching socket.sslerror if built with
 SSL support

Closes: Sf#2998820

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit f03a3f6c8529c15042908d826235e46123cd29e2)
---
 src/utils/web.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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