From e3bd95099bd7f500c75449bf2fead6246d6ce0af Mon Sep 17 00:00:00 2001 From: hvelarde Date: Fri, 4 Mar 2016 14:13:18 -0300 Subject: [PATCH] Use safe_hasattr instead hasattr --- src/brasil/gov/agenda/content/agendadiaria.py | 4 ++-- src/brasil/gov/agenda/upgrades/v2000/handler.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/brasil/gov/agenda/content/agendadiaria.py b/src/brasil/gov/agenda/content/agendadiaria.py index 8b0a6ab..29cd8df 100644 --- a/src/brasil/gov/agenda/content/agendadiaria.py +++ b/src/brasil/gov/agenda/content/agendadiaria.py @@ -139,7 +139,7 @@ def SearchableText_AgendaDiaria(obj): SearchableText.append(obj.location) # Alteracao da agenda update = obj.update - if hasattr(update, 'output'): + if safe_hasattr(update, 'output'): update = update.output SearchableText.append(update) return ' '.join([text for text in SearchableText @@ -188,7 +188,7 @@ def end_date(obj): def exclude_from_nav(obj): # Agendas Diarias sempre serao ocultas da navegacao exclude_from_nav = obj.exclude_from_nav - if hasattr(exclude_from_nav, '__call__'): + if safe_hasattr(exclude_from_nav, '__call__'): exclude_from_nav = exclude_from_nav() return exclude_from_nav diff --git a/src/brasil/gov/agenda/upgrades/v2000/handler.py b/src/brasil/gov/agenda/upgrades/v2000/handler.py index fdc6ce1..add7388 100644 --- a/src/brasil/gov/agenda/upgrades/v2000/handler.py +++ b/src/brasil/gov/agenda/upgrades/v2000/handler.py @@ -2,6 +2,7 @@ from brasil.gov.agenda.config import PROJECTNAME from plone.app.textfield.value import RichTextValue from plone.app.upgrade.utils import loadMigrationProfile +from Products.CMFPlone.utils import safe_hasattr from zope.component.hooks import getSite import logging @@ -28,7 +29,7 @@ def fix_agendadiaria_update(context): obj = brain.getObject() update = u'' if not obj.update else obj.update - if hasattr(update, 'raw'): + if safe_hasattr(update, 'raw'): continue update = update.replace('\n', '
') # Cria o valor RichText