[Erp5-report] r13102 - /erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py

[nobody at svn.erp5.org]

Author: seb
Date: Wed Feb 28 13:38:25 2007
New Revision: 13102

URL: http://svn.erp5.org?rev=13102&view=rev
Log:
do not use hasattr, use getattr(o,prop,_marker) instead

Modified:
    erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py?rev=13102&r1=13101&r2=13102&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py Wed Feb 28 13:38:25 2007
@@ -35,6 +35,8 @@
 from ZODB.POSException import ConflictError
 
 from zLOG import LOG
+
+_marker = object()
 
 manage_addZSQLCatalogForm=DTMLFile('dtml/addZSQLCatalog',globals())
 
@@ -361,7 +363,7 @@
         connection_id = folder.connection_id
         if connection_id in sql_connection_id_dict:
           folder.connection_id = sql_connection_id_dict[connection_id]
-      elif hasattr(aq_base(folder), 'objectValues'):
+      elif getattr(aq_base(folder), 'objectValues', _marker) is not _marker:
         for object in folder.objectValues():
           self.changeSQLConnectionIds(object,sql_connection_id_dict)