[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/real.py Get rid of the ClientForm dependency.

Justas Sadzevičius justas at pov.lt
Mon Sep 24 16:59:14 EDT 2007


Log message for revision 79909:
  Get rid of the ClientForm dependency.
  

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-24 20:57:24 UTC (rev 79908)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-09-24 20:59:14 UTC (rev 79909)
@@ -1,4 +1,3 @@
-import ClientForm
 import os.path
 import re
 import simplejson
@@ -12,9 +11,15 @@
 
 PROMPT = re.compile('repl\d?> ')
 
+
 class BrowserStateError(RuntimeError):
     pass
 
+
+class AmbiguityError(ValueError):
+    pass
+
+
 def controlFactory(token, browser, selectionItem=False):
     tagName = browser.execute('tb_tokens[%s].tagName' % token).lower()
     if tagName == 'select':
@@ -203,8 +208,7 @@
         if token == 'false':
             raise zc.testbrowser.interfaces.LinkNotFoundError
         elif token == 'ambiguity error':
-            # XXX: Should not depend on client form.
-            raise ClientForm.AmbiguityError(msg)
+            raise AmbiguityError(msg)
 
         return Link(token, self)
 
@@ -236,8 +240,7 @@
         if token == 'false':
             raise LookupError(msg)
         elif token == 'ambiguity error':
-            # XXX: Should not depend on client form.
-            raise ClientForm.AmbiguityError(msg)
+            raise AmbiguityError(msg)
 
         return controlFactory(token, self, selectionItem)
 
@@ -445,8 +448,7 @@
         if token == 'false':
             raise LookupError(msg)
         elif token == 'ambiguity error':
-            # XXX: Should not depend on client form.
-            raise ClientForm.AmbiguityError(msg)
+            raise AmbiguityError(msg)
 
         return controlFactory(token, self.browser, selectionItem)
 



More information about the Checkins mailing list