diff options
Diffstat (limited to 'pylibchorus/__init__.py')
-rw-r--r-- | pylibchorus/__init__.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/pylibchorus/__init__.py b/pylibchorus/__init__.py index 079ae14..4c61171 100644 --- a/pylibchorus/__init__.py +++ b/pylibchorus/__init__.py @@ -2,12 +2,10 @@ '''PyLibChorus -- Python Chorus API Library''' import logging -from pylibchorus.chorus_api import login -from pylibchorus.chorus_api import logout -from pylibchorus.chorus_api import check_login_status -from pylibchorus.chorus_api import create_workfile -from pylibchorus.chorus_api import update_workfile_version -from pylibchorus.chorus_api import delete_workfile +from pylibchorus.chorus_api import get +from pylibchorus.chorus_api import post +from pylibchorus.chorus_api import put +from pylibchorus.chorus_api import delete LOG = logging.getLogger(__name__) @@ -17,26 +15,26 @@ class ChorusSession(object): def __init__(self, config): self.config = config - self.sid = None - self.cookies = None + self.sid = '' + self.cookies = {} def __enter__(self): '''create session and return sid and cookies''' LOG.debug("Opening Chorus Session") - code, json, cookies = login( - self.config.get('alpine', 'username'), - self.config.get('alpine', 'password'), - self) + data = { + 'username': self.config.get('alpine', 'username'), + 'password': self.config.get('alpine', 'password'), + } + code, json = post('/sessions', self, data) if code != 201: raise RuntimeError("Chorus Session Login Failed") self.sid = json['response']['session_id'] - self.cookies = dict(cookies) return self def __exit__(self, _type, _value, _traceback): '''Close chorus session''' LOG.debug("Closing Chorus Session") - logout(self) + delete('/sessions', self) |