[Modeling-cvs] ProjectModeling/Modeling ModelValidation.py,1.7,1.8 CHANGES,1.110,1.111

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

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

Modified Files:
	ModelValidation.py CHANGES 
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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ModelValidation.py	11 Jun 2003 11:10:12 -0000	1.7
--- ModelValidation.py	17 Jun 2003 17:01:30 -0000	1.8
***************
*** 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

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/CHANGES,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** CHANGES	12 Jun 2003 11:40:30 -0000	1.110
--- CHANGES	17 Jun 2003 17:01:30 -0000	1.111
***************
*** 8,11 ****
--- 8,14 ----
    --------------------------------------------------------
  
+   * Fixed: adaptorModel() could raise instead of returning None when model's
+     adaptorName is not set
+ 
    * Fixed: PostgresqlSQLExpression was not correctly escaping '%' (postgresql
      interprets the backslash char just like python does, hence escaping '%'