web/views/primary.py
branchstable
changeset 2190 d9f5fd1879fc
parent 2189 08c66a83c3ca
parent 2177 3454adb6164a
child 2217 3a8cee8f8778
equal deleted inserted replaced
2189:08c66a83c3ca 2190:d9f5fd1879fc
    55         self.w(u'<div>')
    55         self.w(u'<div>')
    56         self.w(u'<div class="mainInfo">')
    56         self.w(u'<div class="mainInfo">')
    57         self.content_navigation_components('navcontenttop')
    57         self.content_navigation_components('navcontenttop')
    58         try:
    58         try:
    59             self.render_entity_attributes(entity)
    59             self.render_entity_attributes(entity)
    60         except TypeError: # XXX bw compat
    60         except TypeError, e: # XXX bw compat
       
    61             if 'render_entity' not in e.args[0]:
       
    62                 raise
    61             warn('siderelations argument of render_entity_attributes is '
    63             warn('siderelations argument of render_entity_attributes is '
    62                  'deprecated (%s)' % self.__class__)
    64                  'deprecated (%s)' % self.__class__)
    63             self.render_entity_attributes(entity, [])
    65             self.render_entity_attributes(entity, [])
    64         self.w(u'</div>')
    66         self.w(u'</div>')
    65         if self.main_related_section:
    67         if self.main_related_section:
    66             try:
    68             try:
    67                 self.render_entity_relations(entity)
    69                 self.render_entity_relations(entity)
    68             except TypeError: # XXX bw compat
    70             except TypeError, e: # XXX bw compat
       
    71                 if 'render_entity' not in e.args[0]:
       
    72                     raise
    69                 warn('siderelations argument of render_entity_relations is '
    73                 warn('siderelations argument of render_entity_relations is '
    70                      'deprecated')
    74                      'deprecated')
    71                 self.render_entity_relations(entity, [])
    75                 self.render_entity_relations(entity, [])
    72         self.w(u'</div>')
    76         self.w(u'</div>')
    73         if boxes or hasattr(self, 'render_side_related'):
    77         if boxes or hasattr(self, 'render_side_related'):