adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt tests and rest_client to basic_auth

Browse Source
This commit is contained in:
Matthias
2019-05-25 14:25:36 +02:00
parent 2da7145132
commit febcc3dddc
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/rest_client.py
View File

@@ -30,8 +30,7 @@ class FtRestClient():
self._serverurl = serverurl
self._session = requests.Session()
self._username = username
self._password = password
self._session.auth = (username, password)
def _call(self, method, apipath, params: dict = None, data=None, files=None):
@@ -43,12 +42,6 @@ class FtRestClient():
"Content-Type": "application/json"
}
if self._username:
hd.update({"username": self._username})
if self._password:
hd.update({"password": self._password})
# Split url
schema, netloc, path, par, query, fragment = urlparse(basepath)
# URLEncode query string
@@ -57,9 +50,7 @@ class FtRestClient():
url = urlunparse((schema, netloc, path, par, query, fragment))
try:
resp = self._session.request(method, url, headers=hd, data=json.dumps(data),
# auth=self.session.auth
)
resp = self._session.request(method, url, headers=hd, data=json.dumps(data))
# return resp.text
return resp.json()
except ConnectionError: