mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-12-25 20:22:45 +01:00
Fixed bug #927010.
This commit is contained in:
parent
36f182dc60
commit
4c1d2c6431
@ -112,9 +112,12 @@ def search(log, queries, **kwargs):
|
|||||||
return data
|
return data
|
||||||
except socket.error, e:
|
except socket.error, e:
|
||||||
if e.args[0] == 110:
|
if e.args[0] == 110:
|
||||||
return 'Connection timed out to Google.com.'
|
raise callbacks.Error, 'Connection timed out to Google.com.'
|
||||||
else:
|
else:
|
||||||
raise
|
raise callbacks.Error, 'Error connecting to Google.com.'
|
||||||
|
except SOAP.HTTPError, e:
|
||||||
|
log.warning('HTTP Error accessing Google: %s', e)
|
||||||
|
raise callbacks.Error, 'Error connecting to Google.com.'
|
||||||
except SOAP.faultType, e:
|
except SOAP.faultType, e:
|
||||||
log.exception('Uncaught SOAP error:')
|
log.exception('Uncaught SOAP error:')
|
||||||
raise callbacks.Error, 'Invalid Google license key.'
|
raise callbacks.Error, 'Invalid Google license key.'
|
||||||
@ -122,6 +125,9 @@ def search(log, queries, **kwargs):
|
|||||||
log.exception('Uncaught SAX error:')
|
log.exception('Uncaught SAX error:')
|
||||||
raise callbacks.Error, 'Google returned an unparseable response. ' \
|
raise callbacks.Error, 'Google returned an unparseable response. ' \
|
||||||
'The full traceback has been logged.'
|
'The full traceback has been logged.'
|
||||||
|
except SOAP.Error, e:
|
||||||
|
log.exception('Uncaught SOAP exception in Google.search:')
|
||||||
|
raise callbacks.Error, 'Error connecting to Google.com.'
|
||||||
|
|
||||||
class LicenseKey(registry.String):
|
class LicenseKey(registry.String):
|
||||||
def setValue(self, s):
|
def setValue(self, s):
|
||||||
|
Loading…
Reference in New Issue
Block a user