equal
deleted
inserted
replaced
56 proxy_host=self.proxy[0], |
56 proxy_host=self.proxy[0], |
57 proxy_port=self.proxy[1], |
57 proxy_port=self.proxy[1], |
58 proxy_rdns=self.rdns, |
58 proxy_rdns=self.rdns, |
59 proxy_user=self.proxy_auth and self.proxy_auth[0] or None, |
59 proxy_user=self.proxy_auth and self.proxy_auth[0] or None, |
60 proxy_pass=self.proxy_auth and self.proxy_auth[1] or None) |
60 proxy_pass=self.proxy_auth and self.proxy_auth[1] or None) |
61 proxy_info = None |
|
62 else: |
61 else: |
63 proxy_info = None |
62 proxy_info = None |
64 http = httplib2.Http(timeout=self.timeout, proxy_info=proxy_info) |
63 http = httplib2.Http(timeout=self.timeout, proxy_info=proxy_info) |
65 if self.credentials: |
64 if self.credentials: |
66 http.add_credentials(self.credentials[0], self.credentials[1]) |
65 http.add_credentials(self.credentials[0], self.credentials[1]) |