From 2f70137a1b4951be56ebeb25a186e53551306faa Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Sun, 27 Nov 2011 20:12:42 -0800 Subject: [PATCH] Bug #897054: stack crashes with AttributeError on e.reason if the server returns an error Swap the URLError and HTTPError exception handlers. HTTPError is a subclass of URLError, so the HTTPError handler wasn't being reached. Change-Id: Iec86d2b345dbd37858af888bbd54a74884025eda --- bin/stack | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/stack b/bin/stack index c8a99f073c0b..0b226b7c1294 100755 --- a/bin/stack +++ b/bin/stack @@ -118,12 +118,12 @@ def do_request(controller, method, params=None): req = urllib2.Request(url, data, headers) try: resp = urllib2.urlopen(req) - except urllib2.URLError, e: - print 'Failed to connect to %s: %s' % (url, e.reason) - sys.exit(1) except urllib2.HTTPError, e: print e.read() sys.exit(1) + except urllib2.URLError, e: + print 'Failed to connect to %s: %s' % (url, e.reason) + sys.exit(1) return json.loads(resp.read())