r13505 - Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField

Author: zworkb
Date: Fri Mar  4 11:19:01 2011
New Revision: 13505

Modified:
   Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/DataGridField.py
   Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/DataGridWidget.py
   Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/interfaces.py
   Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/validators.py
Log:
made the interface declarations zope3 compatible

Modified: Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/DataGridField.py
==============================================================================
--- Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/DataGridField.py	(original)
+++ Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/DataGridField.py	Fri Mar  4 11:19:01 2011
@@ -18,7 +18,7 @@
 from Products.Archetypes.Field import registerField
 from Products.DataGridField import DataGridWidget
 from Products.DataGridField.interfaces import IDataGridField
-
+from zope.interface import implements
 # Our logger object
 logger = logging.getLogger('DataGridField')
 logger.debug("DataGridField loading")
@@ -34,8 +34,8 @@
         - Each list item represents a row
         - Each row is a dictionary using column names as a key
     """
-    __implements__ = (ObjectField.__implements__, IDataGridField,)
-
+    #__implements__ = (ObjectField.__implements__, IDataGridField,)
+    implements(IDataGridField)
     _properties = ObjectField._properties.copy()
     _properties.update({
         'type' : 'datagrid',

Modified: Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/DataGridWidget.py
==============================================================================
--- Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/DataGridWidget.py	(original)
+++ Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/DataGridWidget.py	Fri Mar  4 11:19:01 2011
@@ -200,6 +200,7 @@
         for columnId in self.getColumnsConfig(instance).keys():
             columnDefinition = self.getColumnDefinition(field, instance, columnId)
             newData = columnDefinition.processCellData(form, newData, instance, field, columnId)
+                
 
         # Clean up the last empty row (automatically inseted)
         # if auto_insert is enabled

Modified: Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/interfaces.py
==============================================================================
--- Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/interfaces.py	(original)
+++ Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/interfaces.py	Fri Mar  4 11:19:01 2011
@@ -5,7 +5,7 @@
 
 
 # Zope imports
-from Interface import Interface
+from zope.interface import Interface
 
 # DataGrid interfaces
 class IDataGridField(Interface):

Modified: Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/validators.py
==============================================================================
--- Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/validators.py	(original)
+++ Products.DataGridField/branches/quadra-columns_from_methods/Products/DataGridField/validators.py	Fri Mar  4 11:19:01 2011
@@ -4,7 +4,7 @@
 always a hidden entry.  So we check if there is least one normal entry
 and one hidden entry, so more than 1 entry in total.
 """
-
+from zope.interface import implements
 from Products.validation import validation
 from Products.validation.interfaces.IValidator import IValidator
 
@@ -13,7 +13,7 @@
     """Validate as True when having at least one DataGrid item.
     """
 
-    __implements__ = IValidator
+    implements(IValidator)
 
     def __init__(self, name, title='', description=''):
         self.name = name

------------------------------------------------------------------------------
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d