|
15 | 15 | import os |
16 | 16 | import requests |
17 | 17 | 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 |
18 | 22 | from .version import __version__ |
19 | 23 | # Uncomment this to enable http debugging |
20 | 24 | # try: |
@@ -71,7 +75,7 @@ def __init__(self, vcap_services_name, url, username=None, password=None, use_vc |
71 | 75 | """ |
72 | 76 |
|
73 | 77 | self.url = url |
74 | | - self.session = None |
| 78 | + self.jar = None |
75 | 79 | self.api_key = None |
76 | 80 | self.username = None |
77 | 81 | self.password = None |
@@ -108,14 +112,14 @@ def set_username_and_password(self, username=None, password=None): |
108 | 112 |
|
109 | 113 | self.username = username |
110 | 114 | self.password = password |
111 | | - self.session = requests.Session() |
| 115 | + self.jar = CookieJar() |
112 | 116 |
|
113 | 117 | def set_api_key(self, api_key): |
114 | 118 | if api_key == 'YOUR API KEY': |
115 | 119 | api_key = None |
116 | 120 |
|
117 | 121 | self.api_key = api_key |
118 | | - self.session = requests.Session() |
| 122 | + self.jar = CookieJar() |
119 | 123 |
|
120 | 124 | def set_url(self, url): |
121 | 125 | self.url = url |
@@ -235,8 +239,8 @@ def request(self, method, url, accept_json=False, headers=None, params=None, jso |
235 | 239 | else: |
236 | 240 | params['api_key'] = self.api_key |
237 | 241 |
|
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) |
240 | 244 |
|
241 | 245 | if 200 <= response.status_code <= 299: |
242 | 246 | if accept_json: |
|
0 commit comments