[primary view bw compat] we should actually drop 3.2 compat and have proper pre 3.10 compat
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Mon, 25 Oct 2010 10:20:24 +0200
changeset 6616 26587186b856
parent 6615 9807fb5d5f8d
child 6617 120c7ea6e1fa
[primary view bw compat] we should actually drop 3.2 compat and have proper pre 3.10 compat
web/views/primary.py
--- a/web/views/primary.py	Mon Oct 25 10:19:03 2010 +0200
+++ b/web/views/primary.py	Mon Oct 25 10:20:24 2010 +0200
@@ -93,10 +93,8 @@
             self._cw, rset=self.cw_rset, view=self, context=context):
             try:
                 comp.render(w=self.w, row=self.cw_row, view=self)
-            except NotImplementedError:
-                warn('[3.2] component %s doesnt implement cell_call, please update'
-                     % comp.__class__, DeprecationWarning)
-                comp.render(w=self.w, view=self)
+            except TypeError:
+                comp.render(w=self.w)
         self.w(u'</div>')
 
     def render_entity_title(self, entity):
@@ -229,11 +227,8 @@
             else:
                  try:
                      box.render(w=self.w, row=self.cw_row)
-                 except NotImplementedError:
-                    # much probably a context insensitive box, which only
-                    # implements .call() and not cell_call()
-                    # XXX shouldn't occurs with the new box system
-                    box.render(w=self.w)
+                 except TypeError:
+                     box.render(w=self.w)
 
     def _prepare_side_boxes(self, entity):
         sideboxes = []