|
|
@ -881,7 +881,11 @@ class Interface(object): |
|
|
|
timeout = self._options['NetworkManager']['timeout'] |
|
|
|
timeout = self._options['NetworkManager']['timeout'] |
|
|
|
_log.debug('Starting request of %s (timeout %ds)' % ( |
|
|
|
_log.debug('Starting request of %s (timeout %ds)' % ( |
|
|
|
url, timeout)) |
|
|
|
url, timeout)) |
|
|
|
|
|
|
|
try: |
|
|
|
response = urllib2.urlopen(request, timeout=timeout) |
|
|
|
response = urllib2.urlopen(request, timeout=timeout) |
|
|
|
|
|
|
|
except TypeError, e: |
|
|
|
|
|
|
|
# Python 2.5 don't have a timeout parameter |
|
|
|
|
|
|
|
response = urllib2.urlopen(request) |
|
|
|
data = response.read() |
|
|
|
data = response.read() |
|
|
|
_log.debug('Request completed') |
|
|
|
_log.debug('Request completed') |
|
|
|
return (url, data) |
|
|
|
return (url, data) |
|
|
|