Use safe_hasattr instead hasattr

plonegovbr · Mar 4, 2016 · e3bd950 · e3bd950
1 parent fa78b31
commit e3bd950
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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', '<br />')
         # Cria o valor RichText