From 567cd195d31f2df1d8052acf7ecb433a9a24fbd9 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Thu, 30 Sep 2004 14:53:22 +0000 Subject: [PATCH] Fixed to catch our SOAPpy errors. --- plugins/Google.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/Google.py b/plugins/Google.py index 61a1a9eed..b3e50d64b 100644 --- a/plugins/Google.py +++ b/plugins/Google.py @@ -44,7 +44,7 @@ import socket import urllib import xml.sax -import SOAP +import SOAPpy import google import supybot.registry as registry @@ -116,17 +116,18 @@ def search(log, queries, **kwargs): raise callbacks.Error, 'Connection timed out to Google.com.' else: raise callbacks.Error, 'Error connecting to Google.com.' - except SOAP.HTTPError, e: + except SOAPpy.HTTPError, e: log.info('HTTP Error accessing Google: %s', e) raise callbacks.Error, 'Error connecting to Google.com.' - except SOAP.faultType, e: - log.exception('Uncaught SOAP error:') + except SOAPpy.faultType, e: + if 'Invalid authorization key' not in e.faultstring: + log.exception('Unexpected SOAPpy error:') raise callbacks.Error, 'Invalid Google license key.' except xml.sax.SAXException, e: log.exception('Uncaught SAX error:') raise callbacks.Error, 'Google returned an unparsable response. ' \ 'The full traceback has been logged.' - except SOAP.Error, e: + except SOAPpy.Error, e: log.exception('Uncaught SOAP exception in Google.search:') raise callbacks.Error, 'Error connecting to Google.com.'