Changeset 107

Timestamp:

02/02/06 16:13:01 (19 years ago)

Author:

jerome

Message:

Now the network dialog is binary safe.

Location:

pykoticon/trunk

Files:

• bin/pykoticon (modified) (3 diffs)
• tests/test.py (modified) (1 diff)

pykoticon/trunk/bin/pykoticon

@@ -84 +84 @@
     def export_quitApplication(self) :    
         """Makes the application quit."""
-        self.logDebug("Remote host asked to close the application.")
         self.frame.quitEvent.set()
         wx.CallAfter(self.frame.OnClose, None)
@@ -91 +90 @@
     def export_askDatas(self, labels, varnames, varvalues) :
         """Asks some textual datas defined by a list of labels, a list of variables' names and a list of variables values in a mapping."""
-        wx.CallAfter(self.frame.askDatas, labels, varnames, varvalues)
+        values = {}
+        for (k, v) in varvalues.items() :
+            values[k] = v.data
+        wx.CallAfter(self.frame.askDatas, [ v.data for v in labels ], \
+                                          varnames, \
+                                          values)
+        # ugly, isn't it ?
+        while self.frame.dialogAnswer is None :
+            time.sleep(0.1)
+        retcode = self.frame.dialogAnswer    
+        for (k, v) in retcode.items() :
+            if k != "isValid" :
+                retcode[k] = xmlrpclib.Binary(v)
+        self.frame.dialogAnswer = None # prepare for next call, just in case
+        return retcode
+        
+    def export_showDialog(self, message, yesno) :
+        """Opens a notification or confirmation dialog."""
+        wx.CallAfter(self.frame.showDialog, message.data, yesno)
         # ugly, isn't it ?
         while self.frame.dialogAnswer is None :
@@ -99 +116 @@
         return retcode
         
-    def export_showDialog(self, message, yesno) :
-        """Opens a notification or confirmation dialog."""
-        wx.CallAfter(self.frame.showDialog, message, yesno)
-        # ugly, isn't it ?
-        while self.frame.dialogAnswer is None :
-            time.sleep(0.1)
-        retcode = self.frame.dialogAnswer    
-        self.frame.dialogAnswer = None # prepare for next call, just in case
-        return retcode
-        
     def export_nop(self) :    
         """Does nothing, but allows a clean shutdown from the frame itself."""
-        self.logDebug("No operation !")
         return True
         

pykoticon/trunk/tests/test.py

@@ -50 +50 @@
 
     server = xmlrpclib.ServerProxy("http://%s:%s" % (arguments[0], arguments[1]))
-    #result = server.showDialog(message, yesno)
+    #result = server.showDialog(xmlrpclib.Binary(message), yesno)
     #"""
-    result = server.askDatas(["Username", "Password", "Billing code"], \
+    result = server.askDatas([xmlrpclib.Binary(v) for v in ["Username", "Password", "Billing code"]], \
                              ["username", "password", "billingcode"], \
-                             {"username": username, \
-                              "password": "cccccc", \
-                              "billingcode" : billingcode})
+                             {"username": xmlrpclib.Binary(username), \
+                              "password": xmlrpclib.Binary(""), \
+                              "billingcode" : xmlrpclib.Binary(billingcode)})
     #"""                          
     #server.quitApplication()
     if result["isValid"] :
-        print result # printing OK is safe.
+        print "\n".join(["%s => '%s'" % (k, v.data) for (k, v) in result.items() if k != "isValid"])
     else :    
         print "the end user closed the dialog box !"