[gnue] r7403 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2005-04-18 16:21:39 -0500 (Mon, 18 Apr 2005)
New Revision: 7403

Modified:
   trunk/gnue-forms/src/GFObjects/GFDataSource.py
Log:
Don't use weak references, added function to access block bound to a
datasource.


Modified: trunk/gnue-forms/src/GFObjects/GFDataSource.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFDataSource.py      2005-04-18 20:59:41 UTC 
(rev 7402)
+++ trunk/gnue-forms/src/GFObjects/GFDataSource.py      2005-04-18 21:21:39 UTC 
(rev 7403)
@@ -50,36 +50,40 @@
 
   # Remember the block this DataSource is bound to
   def setBlock (self, block):
-    self.__block = weakref.ref (block)
+    self.__block = block
 
 
+  def getBlock (self, block):
+    return self.__block
+
+
   #
   # Hooks for record-level triggers
   #
 
   def _beforeCommitInsert(self, record):
-    if self.__block and self.__block():
-      self._form.dispatchEvent('preInsert', record=record, 
block=self.__block())
-      self._form.dispatchEvent('preCommit', record=record, 
block=self.__block())
+    if self.__block:
+      self._form.dispatchEvent('preInsert', record=record, block=self.__block)
+      self._form.dispatchEvent('preCommit', record=record, block=self.__block)
 
   def _beforeCommitUpdate(self, record):
-    if self.__block and self.__block():
-      self._form.dispatchEvent('preUpdate', record=record, 
block=self.__block())
-      self._form.dispatchEvent('preCommit', record=record, 
block=self.__block())
+    if self.__block:
+      self._form.dispatchEvent('preUpdate', record=record, block=self.__block)
+      self._form.dispatchEvent('preCommit', record=record, block=self.__block)
 
   def _beforeCommitDelete(self, record):
-    if self.__block and self.__block():
-      self._form.dispatchEvent('preDelete', record=record, 
block=self.__block())
-      self._form.dispatchEvent('preCommit', record=record, 
block=self.__block())
+    if self.__block:
+      self._form.dispatchEvent('preDelete', record=record, block=self.__block)
+      self._form.dispatchEvent('preCommit', record=record, block=self.__block)
 
   def _onModification(self, record):
-    if self.__block and self.__block():
+    if self.__block:
       self._form.dispatchEvent('onRecordTouched', record=record,
-          block=self.__block())
+          block=self.__block)
     return True
 
   def _onRecordLoaded(self, record):
-    if self.__block and self.__block():
+    if self.__block:
       self._form.dispatchEvent('onQueryNewRecord', record=record,
-          block=self.__block())
+          block=self.__block)
     return True