Changement du mdp

[NK2015_Client_Python_Alpha.git] / client.py

diff --git a/client.py b/client.py
index fb4764b9dde19dd6188b891adec4beaaddc4bbca..8cbbb33c46d4bb41ff10c28ba7596e22bbc75505 100755 (executable)
--- a/client.py
+++ b/client.py
@@ -45,36 +45,34 @@ def checkidentity(a):
 
 def hello(socket,version):
     socket.send('hello "%s"'%(version))
-    return json.loads(a.read())
+    return lit(a)
 
 def login(socket,user,mdp="",typ="bdd"):
     if user in ["20-100","moibdd"]:
-        a.write('login ["20-100","mdp","bdd"]')
+        a.write('login ["20-100","plop","bdd"]')
     elif user in ["vincent","moi"]:
-        a.write('login ["vincent","mdp","special"]')
+        a.write('login ["vincent","plop","special"]')
     else:
         a.write('login ["%s","%s","%s"]'%(user,mdp,typ))
-    return json.loads(a.read())
+    return lit(a)
     
 def search(socket,term):
     a.write("search %s"%(term))
     return json.loads(a.read())
 
-def lit(socket,noprint=False):
+def lit(socket):
     try:
         t=a.read()
-        if noprint:
-            return json.loads(t)
+        obj=json.loads(t)
+        if obj["retcode"]==0:
+          return obj['msg']
         else:
-            obj=json.loads(t)
-            if type(obj)==unicode:
-              print obj
-            else:
-              pprint(obj)
+          print obj["errmsg"]
+          return obj["msg"]
     except ssl.SSLError:
-        print "Rien à lire"
+        return "Rien à lire"
     except ValueError:
-        print "Serveur mort ?"
+        return "Serveur mort ?"
 
 def challenge(a):
     _,pub=monRSA.litcles(None,client_config.server_rsa_pub_key)