From e64ce629179e1aecf354fdec3a6f7f93627c21ae Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Tue, 30 Mar 2004 08:33:20 +0000
Subject: [PATCH] Updated slightly.

---
 src/webutils.py | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/webutils.py b/src/webutils.py
index b6b7287ef..efc5bd293 100644
--- a/src/webutils.py
+++ b/src/webutils.py
@@ -45,8 +45,25 @@ urlRe = re.compile(r"(\w+://[^\])>\s]+)", re.I)
 
 REFUSED = 'Connection refused.'
 TIMED_OUT = 'Connection timed out.'
+UNKNOWN_HOST = 'Unknown host.'
 RESET_BY_PEER = 'Connection reset by peer.'
 
+def strError(e):
+    try:
+        n = e.args[0]
+    except Exception:
+        return str(e)
+    if n == 111:
+        return REFUSED
+    elif n in (110, 10060):
+        return TIMED_OUT
+    elif n == 104:
+        return RESET_BY_PEER
+    elif n == 8:
+        return UNKNOWN_HOST
+    else:
+        return str(e)
+    
 def getUrlFd(url):
     """Gets a file-like object for a url."""
     try:
@@ -55,15 +72,10 @@ def getUrlFd(url):
     except socket.timeout, e:
         raise WebError, TIMED_OUT
     except socket.error, e:
-        if e.args[0] == 111:
-            raise WebError, REFUSED
-        elif e.args[0] in (110, 10060):
-            raise WebError, TIMED_OUT
-        elif e.args[0] == 104:
-            raise WebError, RESET_BY_PEER
-        else:
-            raise WebError, str(e)
-    except (urllib2.HTTPError, urllib2.URLError), e:
+        raise WebError, strError(e)
+    except urllib2.URLError, e:
+        raise WebError, strError(e.reason)
+    except urllib2.HTTPError, e:
         raise WebError, str(e)
     
 def getUrl(url, size=None):