[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/real.py Implement disabled and control properties for ItemControl.

Justas Sadzevičius justas at pov.lt
Wed Sep 26 12:41:59 EDT 2007


Log message for revision 80115:
  Implement disabled and control properties for ItemControl.
  Unbreak ListControl.value property
  

Changed:
  U   zc.testbrowser/trunk/src/zc/testbrowser/real.py

-=-
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-09-26 16:31:02 UTC (rev 80114)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-09-26 16:41:58 UTC (rev 80115)
@@ -480,8 +480,6 @@
                 'tb_get_listcontrol_value(%r)' % self.token)
 
             v = [option for option in simplejson.loads(options)]
-            if not self.really_multiple:
-                v = v[0]
             return v
 
         def fset(self, value):
@@ -571,14 +569,12 @@
     def control(self):
         if self._browser_counter != self.browser._counter:
             raise zc.testbrowser.interfaces.ExpiredError
-        res = controlFactory(
-            self.mech_item._control, self.mech_form, self.browser)
-        self.__dict__['control'] = res
-        return res
+        return controlFactory(self.token, self.browser)
 
     @property
     def disabled(self):
-        return self.mech_item.disabled
+        return self.browser.execute(
+            'tb_tokens[%s].hasAttribute("disabled")' % self.token) == 'true'
 
     @apply
     def selected():



More information about the Checkins mailing list