[wwwsearch-commits] r18288 - wwwsearch/ClientForm/trunk

[jjlee at codespeak.net]

Author: jjlee
Date: Sat Oct  8 16:23:42 2005
New Revision: 18288

Modified:
   wwwsearch/ClientForm/trunk/ClientForm.py
Log:
Make .get()'s exception messages more informative

Modified: wwwsearch/ClientForm/trunk/ClientForm.py
==============================================================================
--- wwwsearch/ClientForm/trunk/ClientForm.py	(original)
+++ wwwsearch/ClientForm/trunk/ClientForm.py	Sat Oct  8 16:23:42 2005
@@ -1441,15 +1441,16 @@
 # You never want an item to have an incorrect reference to its control (and
 # thus you never want an item to be in more than one control).
 
-def disambiguate(items, nr, name):
+def disambiguate(items, nr, name, label):
+    msg = "name=%r label=%r" % (name, label)
     if not items:
-        raise ItemNotFoundError(name)
+        raise ItemNotFoundError(msg)
     if nr is None:
         if len(items) > 1:
-            raise AmbiguityError(name)
+            raise AmbiguityError(msg)
         nr = 0
     if len(items) <= nr:
-        raise ItemNotFoundError(name)
+        raise ItemNotFoundError(msg)
     return items[nr]
 
 class ListControl(Control):
@@ -1614,7 +1615,7 @@
         if nr is None and self._form.backwards_compat:
             nr = 0  # :-/
         items = self.get_items(name, label, exclude_disabled)
-        return disambiguate(items, nr, name)
+        return disambiguate(items, nr, name, label)
 
     def _get(self, name, by_label=False, nr=None, exclude_disabled=False):
         # strictly for use by deprecated methods