aboutsummaryrefslogtreecommitdiff
path: root/describe.py
diff options
context:
space:
mode:
authorIgor Maravić <i.maravic@gmail.com>2017-01-19 22:28:22 +0100
committerJon Wayne Parrott <jonwayne@google.com>2017-01-19 13:28:22 -0800
commit2243529e68a76f5419b2ba62aae2efef5eba2d98 (patch)
treec4c272228a5034563aef94c7a06a7629985e55f4 /describe.py
parent811d5700dc57daa8109820ba65de1b91db1e3369 (diff)
downloadgoogle-api-python-client-2243529e68a76f5419b2ba62aae2efef5eba2d98.tar.gz
Set default HTTP timeout of 60s (#320)
Diffstat (limited to 'describe.py')
-rwxr-xr-xdescribe.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/describe.py b/describe.py
index 6d577defa..e3881aec4 100755
--- a/describe.py
+++ b/describe.py
@@ -34,7 +34,7 @@ from googleapiclient.discovery import DISCOVERY_URI
from googleapiclient.discovery import build
from googleapiclient.discovery import build_from_document
from googleapiclient.discovery import UnknownApiNameOrVersion
-import httplib2
+from googleapiclient.http import build_http
import uritemplate
CSS = """<style>
@@ -346,6 +346,7 @@ def document_api(name, version):
print 'Warning: {} {} found but could not be built.'.format(name, version)
return
+ http = build_http()
response, content = http.request(
uritemplate.expand(
FLAGS.discovery_uri_template, {
@@ -366,7 +367,7 @@ def document_api_from_discovery_document(uri):
Args:
uri: string, URI of discovery document.
"""
- http = httplib2.Http()
+ http = build_http()
response, content = http.request(FLAGS.discovery_uri)
discovery = json.loads(content)
@@ -384,7 +385,7 @@ if __name__ == '__main__':
if FLAGS.discovery_uri:
document_api_from_discovery_document(FLAGS.discovery_uri)
else:
- http = httplib2.Http()
+ http = build_http()
resp, content = http.request(
FLAGS.directory_uri,
headers={'X-User-IP': '0.0.0.0'})