0x2620/pandora_client
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make login optional, support passing config dict

Browse source
This commit is contained in:
j 2010-11-18 15:34:34 +01:00
commit e44dad7dec
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pandora_client/__init__.py
View file

@ -47,14 +47,19 @@ def encode(filename, profile):
class Client(object):
def __init__(self, config):
with open(config) as f:
self._config = json.loads(f.read())
self.api = API(self._config['url'])
r = self.api.login({'username':self._config['username'], 'password':self._config['password']})
if r['status']['code'] == 200:
self.user = r['data']['user']
if isinstance(config, basestring):
with open(config) as f:
self._config = json.loads(f.read())
else:
print 'login failed'
self.config = config
self.api = API(self._config['url'])
if 'username' in self._config:
r = self.api.login({'username':self._config['username'], 'password':self._config['password']})
if r['status']['code'] == 200:
self.user = r['data']['user']
else:
print 'login failed'
conn, c = self._conn()