--- a/web/views/primary.py Fri Oct 21 14:32:18 2011 +0200
+++ b/web/views/primary.py Fri Oct 21 14:32:37 2011 +0200
@@ -148,9 +148,6 @@
if boxes or hasattr(self, 'render_side_related'):
self.w(u'</td><td>')
self.w(u'<div class="primaryRight">')
- if hasattr(self, 'render_side_related'):
- warn('[3.2] render_side_related is deprecated')
- self.render_side_related(entity, []) # pylint: disable=E1101
self.render_side_boxes(boxes)
self.w(u'</div>')
self.w(u'</td></tr></table>')
@@ -222,17 +219,12 @@
if not hasattr(self, '_render_attribute'):
label = self._rel_label(entity, rschema, role, dispctrl)
self.render_attribute(label, value, table=True)
- elif support_args(self._render_attribute, 'dispctrl'):
+ else:
warn('[3.9] _render_attribute prototype has changed and '
'renamed to render_attribute, please update %s'
% self.__class__, DeprecationWarning)
self._render_attribute(dispctrl, rschema, value, role=role,
table=True)
- else:
- self._render_attribute(rschema, value, role=role, table=True)
- warn('[3.6] _render_attribute prototype has changed and '
- 'renamed to render_attribute, please update %s'
- % self.__class__, DeprecationWarning)
self.w(u'</table>')
def render_attribute(self, label, value, table=False):
@@ -258,17 +250,10 @@
continue
if hasattr(self, '_render_relation'):
# pylint: disable=E1101
- if not support_args(self._render_relation, 'showlabel'):
- self._render_relation(dispctrl, rset, 'autolimited')
- warn('[3.9] _render_relation prototype has changed and has '
- 'been renamed to render_relation, please update %s'
- % self.__class__, DeprecationWarning)
- else:
- self._render_relation(rset, dispctrl, 'autolimited',
- self.show_rel_label)
- warn('[3.6] _render_relation prototype has changed and has '
- 'been renamed to render_relation, please update %s'
- % self.__class__, DeprecationWarning)
+ self._render_relation(dispctrl, rset, 'autolimited')
+ warn('[3.9] _render_relation prototype has changed and has '
+ 'been renamed to render_relation, please update %s'
+ % self.__class__, DeprecationWarning)
continue
vid = dispctrl.get('vid', 'autolimited')
try: