- try:
- r = requests.get(
- url, timeout=self.timeout, allow_redirects=False,
- proxies={'http': self.proxy, 'https': self.proxy})
- except requests.RequestException as e:
- error = str(e)
- self.log(' Proxy error: %s' % error)
- if error is not None:
- return error, None, None, None, None
+ error, r = request_get(url, self.timeout, self.proxy)
+ if error is not None:
+ if self.proxy:
+ self.log(' Proxy error: %s' % error)
+ return error, None, None, None, None