Merge lp:~flacoste/lazr.restful/better-asserts into lp:lazr.restful

[Francis J. Lacoste]

[Francis J. Lacoste (flacoste)]

Please review my branch:

   bzr+ssh://bazaar.launchpad.net/~flacoste/lazr.restful/better-asserts

revision 36.

This adds an assert to catch errors when the adapter cannot be found. This
lead previously to fail in the other assert where i expanded the error
message.

This will help debug things when there are errors in the annotations.

--
Francis J. Lacoste
<email address hidden>

[Barry Warsaw (barry)]

I've actually looked at this code recently. These are good helpful additions I think!

review: Approve

=== modified file 'src/lazr/restful/_resource.py'
--- src/lazr/restful/_resource.py	2009-04-24 15:28:26 +0000
+++ src/lazr/restful/_resource.py	2009-05-01 17:52:00 +0000
@@ -1675,6 +1675,8 @@
         """
         entry_class = getGlobalSiteManager().adapters.lookup(
             (entry_interface,), IEntry)
+        assert entry_class is not None, (
+            "No IEntry adapter found for %s." % entry_interface.__name__)
         return EntryAdapterUtility(entry_class)
 
     @classmethod
@@ -1704,9 +1706,11 @@
         interfaces = implementedBy(self.entry_class)
         entry_ifaces = [interface for interface in interfaces
                         if interface.extends(IEntry)]
-        assert len(entry_ifaces) == 1, ("There must be one and only one "
-                                        "IEntry implementation "
-                                        "for %s" % self.entry_class)
+        assert len(entry_ifaces) == 1, (
+            "There must be one and only one IEntry implementation "
+            "for %s, found %s" % (
+                self.entry_class,
+                ", ".join(interface.__name__ for interface in entry_ifaces)))
         return entry_ifaces[0]
 
     @property