From: James French <frenchie@frenchie.id.au>
Date: Mon, 2 Aug 2010 05:12:33 +0000 (+0800)
Subject: Catching some more exceptions
X-Git-Tag: 0.7~9
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=bac45db04f25fc3704d752e037579b8a3f19bd9d;p=frenchie%2Ficalparse.git

Catching some more exceptions
---

diff --git a/icalparse.py b/icalparse.py
index 780750b..2c7ec4e 100755
--- a/icalparse.py
+++ b/icalparse.py
@@ -97,7 +97,7 @@ def getContent(url='',stdin=False):
 		res = urllib2.urlopen(url)
 		content = res.read()
 		res.close()
-	except (urllib2.URLError, ValueError), e:
+	except (urllib2.URLError, OSError), e:
 		sys.stderr.write('%s\n'%e)
 		sys.exit(1)
 	return content
@@ -131,7 +131,7 @@ def getHTTPContent(url='',cache='.httplib2-cache'):
 	try:
 		content = urllib2.urlopen(url).read()
 		return content
-	except urllib2.URLError, e:
+	except (urllib2.URLError, OSError), e:
 		sys.stderr.write('%s\n'%e)
 		sys.exit(1)