gnue/common/src GDataObjects.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/04/12 01:29:11

Modified files:
        common/src     : GDataObjects.py 

Log message:
        A (small) amount of code cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataObjects.py.diff?tr1=1.47&tr2=1.48&r1=text&r2=text

Patches:
Index: gnue/common/src/GDataObjects.py
diff -c gnue/common/src/GDataObjects.py:1.47 
gnue/common/src/GDataObjects.py:1.48
*** gnue/common/src/GDataObjects.py:1.47        Fri Apr 12 00:58:58 2002
--- gnue/common/src/GDataObjects.py     Fri Apr 12 01:29:11 2002
***************
*** 142,149 ****
    # the master ResultSet and the detail ResultSet
    def addDetailDataObject(self, dataObject, handler=None, **params):
  
!     for param in params.keys():
!       dataObject.__dict__[param] = params[param]
  
      GDebug.printMesg (1,"Adding a master/detail relationship to DataObject")
      dataObject._masterObject = self
--- 142,148 ----
    # the master ResultSet and the detail ResultSet
    def addDetailDataObject(self, dataObject, handler=None, **params):
  
!     dataObject.__dict__.update(params)
  
      GDebug.printMesg (1,"Adding a master/detail relationship to DataObject")
      dataObject._masterObject = self
***************
*** 279,286 ****
       self._recordCount = 0
  
       self._defaultValues = {}
!      for key in defaultValues.keys():
!        self._defaultValues[key] = defaultValues[key]
  
       self.current = None
  
--- 278,284 ----
       self._recordCount = 0
  
       self._defaultValues = {}
!      self._defaultValues.update(defaultValues)
  
       self.current = None
  
***************
*** 353,359 ****
      if self._currentRecord < 1:
        return 0
      else:
!       self._currentRecord = self._currentRecord - 1
        self.current = self._cachedRecords[self._currentRecord]
        self.notifyDetailObjects()
        return 1
--- 351,357 ----
      if self._currentRecord < 1:
        return 0
      else:
!       self._currentRecord -= 1
        self.current = self._cachedRecords[self._currentRecord]
        self.notifyDetailObjects()
        return 1
***************
*** 491,497 ****
        return 1
      else:
        #TODO: the string.lower() line should never be called but is left
!       #TODO: here untill the cod
        return 
self._dataObject._fieldReferences.has_key(string.lower(fieldName))
  
  
--- 489,495 ----
        return 1
      else:
        #TODO: the string.lower() line should never be called but is left
!       #TODO: here untill the code is cleaned up
        return 
self._dataObject._fieldReferences.has_key(string.lower(fieldName))