Skip to content

Commit 8f6ce06

Browse files
authored
Merge pull request #976 from Dev4Mod/master
Add timeout support to HTTP requests
2 parents d572da8 + 0380d37 commit 8f6ce06

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

office365/runtime/client_request.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def execute_request_direct(self, request):
5353
auth=request.auth,
5454
verify=request.verify,
5555
proxies=request.proxies,
56+
timeout=request.timeout
5657
)
5758
else:
5859
response = requests.post(
@@ -62,6 +63,7 @@ def execute_request_direct(self, request):
6263
auth=request.auth,
6364
verify=request.verify,
6465
proxies=request.proxies,
66+
timeout=request.timeout
6567
)
6668
elif request.method == HttpMethod.Patch:
6769
response = requests.patch(
@@ -71,6 +73,7 @@ def execute_request_direct(self, request):
7173
auth=request.auth,
7274
verify=request.verify,
7375
proxies=request.proxies,
76+
timeout=request.timeout
7477
)
7578
elif request.method == HttpMethod.Delete:
7679
response = requests.delete(
@@ -79,6 +82,7 @@ def execute_request_direct(self, request):
7982
auth=request.auth,
8083
verify=request.verify,
8184
proxies=request.proxies,
85+
timeout=request.timeout
8286
)
8387
elif request.method == HttpMethod.Put:
8488
response = requests.put(
@@ -88,6 +92,7 @@ def execute_request_direct(self, request):
8892
auth=request.auth,
8993
verify=request.verify,
9094
proxies=request.proxies,
95+
timeout=request.timeout
9196
)
9297
else:
9398
response = requests.get(
@@ -97,6 +102,7 @@ def execute_request_direct(self, request):
97102
verify=request.verify,
98103
stream=request.stream,
99104
proxies=request.proxies,
105+
timeout=request.timeout
100106
)
101107
response.raise_for_status()
102108
return response

office365/runtime/http/request_options.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ def __init__(self, url, method=HttpMethod.Get, data=None):
2020
self.verify = True
2121
self.stream = False
2222
self.proxies = None
23+
self.timeout = None
2324

2425
@property
2526
def is_file(self):

0 commit comments

Comments
 (0)