[Modeling-cvs] ProjectModeling/Modeling DatabaseContext.py,1.18,1.19

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1:/tmp/cvs-serv32715

Modified Files:
	DatabaseContext.py 
Log Message:
Fixed bug #774989: improper result returned by CustomObject.snapshot() wrt
tomany relationships --see CustomObject.snapshot() documentation for details.


Index: DatabaseContext.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/DatabaseContext.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DatabaseContext.py	28 Jul 2003 06:15:15 -0000	1.18
--- DatabaseContext.py	2 Aug 2003 11:16:40 -0000	1.19
***************
*** 1292,1298 ****
      for key in toManyKeys:
        _sn=objectSnapshot[key]
!       if _sn is not None: 
!         # 'faulted toMany' are None when returned from
!         # CustomObject.snapshot()
          toManySnap[key]=objectSnapshot[key]
          # replace any TemporaryGlobalID with its corresponding new value
--- 1292,1299 ----
      for key in toManyKeys:
        _sn=objectSnapshot[key]
!       from CustomObject import Snapshot_ToManyFault
!       if not isinstance(_sn, Snapshot_ToManyFault): 
!         # 'faulted toMany' are instances of Snapshot_ToManyFault when returned
!         # by CustomObject.snapshot()
          toManySnap[key]=objectSnapshot[key]
          # replace any TemporaryGlobalID with its corresponding new value