[gnue] r7373 - trunk/gnue-common/src/datasources/drivers/Base

[reinhard]

Author: reinhard
Date: 2005-04-15 06:50:23 -0500 (Fri, 15 Apr 2005)
New Revision: 7373

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Removed now unused RecordSet._parent.


Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-15 
11:45:41 UTC (rev 7372)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-15 
11:50:23 UTC (rev 7373)
@@ -38,14 +38,22 @@
   # Constructor
   # ---------------------------------------------------------------------------
 
-  def __init__ (self, parent, initialData = {}, defaultData = {},
-      connection = None, tablename = '', boundFields = [], readonly = False,
-      masterRecord = None, masterKeyFields = [], masterLinkFields = [],
-      rowidField = None, primarykeyFields = [], dataSource = None):
+  def __init__ (self,
+      initialData = {},
+      defaultData = {},
+      connection = None,
+      tablename = '',
+      boundFields = [],
+      readonly = False,
+      masterRecord = None,
+      masterKeyFields = [],
+      masterLinkFields = [],
+      rowidField = None,
+      primarykeyFields = [],
+      dataSource = None):
     """
     Create a new RecordSet instance.
 
-    @param parent: ResultSet this RecordSet is a part of.
     @param initialData: Dictionary with the record's data if it's an existing
       record. Keys of the dictionary are field names.
     @param defaultData: Dictionary with default data to be used if it is a new
@@ -91,10 +99,6 @@
     # Existing records: 'clean' -(setField)-> 'modified' -(delete)-> 'deleted'
     self.__status = 'clean'
 
-    # The ResultSet this RecordSet is a part of - FIXME: this should go away,
-    # but is still used in GFInstance (!)
-    self._parent = parent
-
     # The field values
     self.__fields = {}
 

Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-15 
11:45:41 UTC (rev 7372)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-15 
11:50:23 UTC (rev 7373)
@@ -152,7 +152,6 @@
     __defaultData.update (defaultData)
 
     record = RecordSet (
-        parent           = self,
         initialData      = initialData,
         defaultData      = __defaultData,
         connection       = self._dataObject._dataSource._connection,
@@ -633,15 +632,11 @@
 
     self.__generator = None
 
-    for item in self._cachedRecords:
-      item._parent = None
-
     if self._dataObject._dataSource and \
         self._dataObject._dataSource._currentResultSet == self:
       self._dataObject._dataSource.close ()
       self._dataObject = None
 
-    self._cachedRecords = []
     self.__listeners    = []