Skip to content

Commit 500e311

Browse files
committed
rolling back request.session due to sporatic connection errors
1 parent c31350d commit 500e311

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

watson_developer_cloud/watson_developer_cloud_service.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
import os
1616
import requests
1717
from requests.structures import CaseInsensitiveDict
18+
try:
19+
from http.cookiejar import CookieJar # Python 3
20+
except ImportError:
21+
from cookielib import CookieJar # Python 2
1822
from .version import __version__
1923
# Uncomment this to enable http debugging
2024
# try:
@@ -71,7 +75,7 @@ def __init__(self, vcap_services_name, url, username=None, password=None, use_vc
7175
"""
7276

7377
self.url = url
74-
self.session = None
78+
self.jar = None
7579
self.api_key = None
7680
self.username = None
7781
self.password = None
@@ -108,14 +112,14 @@ def set_username_and_password(self, username=None, password=None):
108112

109113
self.username = username
110114
self.password = password
111-
self.session = requests.Session()
115+
self.jar = CookieJar()
112116

113117
def set_api_key(self, api_key):
114118
if api_key == 'YOUR API KEY':
115119
api_key = None
116120

117121
self.api_key = api_key
118-
self.session = requests.Session()
122+
self.jar = CookieJar()
119123

120124
def set_url(self, url):
121125
self.url = url
@@ -235,8 +239,8 @@ def request(self, method, url, accept_json=False, headers=None, params=None, jso
235239
else:
236240
params['api_key'] = self.api_key
237241

238-
response = self.session.request(method=method, url=full_url, auth=auth, headers=headers,
239-
params=params, data=data, files=files, **kwargs)
242+
response = requests.request(method=method, url=full_url, cookies=self.jar, auth=auth, headers=headers,
243+
params=params, data=data, files=files, **kwargs)
240244

241245
if 200 <= response.status_code <= 299:
242246
if accept_json:

0 commit comments

Comments
 (0)