[Modeling-cvs] ProjectModeling/Modeling ModelValidation.py,1.6,1.6.6.1

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

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

Modified Files:
      Tag: brch-0_9pre7-1-PyModel
	ModelValidation.py 
Log Message:
Fixed: adaptorModel() could raise instead of returning None when model's adaptorName is not set

Index: ModelValidation.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/ModelValidation.py,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -C2 -d -r1.6 -r1.6.6.1
*** ModelValidation.py	14 Mar 2003 14:33:40 -0000	1.6
--- ModelValidation.py	17 Jun 2003 16:59:31 -0000	1.6.6.1
***************
*** 490,494 ****
    try:
      concreteAdaptor=Adaptor.adaptorWithName(model.adaptorName())
!   except AdaptorImportError:
!     pass
    return concreteAdaptor
--- 490,494 ----
    try:
      concreteAdaptor=Adaptor.adaptorWithName(model.adaptorName())
!   except AdaptorImportError: pass
!   except ValueError: pass
    return concreteAdaptor