[Modeling-cvs] ProjectModeling/Modeling/tests/testPackages/StoreEmployees __init__.py,1.2.4.1,1.2.4.2

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

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests/testPackages/StoreEmployees
In directory sc8-pr-cvs1:/tmp/cvs-serv5668/tests/testPackages/StoreEmployees

Modified Files:
      Tag: brch-0_9pre7-1-PyModel
	__init__.py 
Log Message:
Modified so that it uses Model.searchModel()

Index: __init__.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/testPackages/StoreEmployees/__init__.py,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** __init__.py	18 May 2003 15:26:25 -0000	1.2.4.1
--- __init__.py	17 Jun 2003 17:03:55 -0000	1.2.4.2
***************
*** 1,51 ****
  # Load the model
  
! from Modeling import ModelSet
! import os, warnings, StringIO, traceback
! 
! try:
!   if ModelSet.defaultModelSet().modelNamed("StoreEmployees") is None:
!     from pymodel_StoreEmployees import model
!     model.build()
!     ModelSet.defaultModelSet().addModel(model.component)
!     model=ModelSet.defaultModelSet().modelNamed('StoreEmployees')
! except:
!   exc=StringIO.StringIO()
!   traceback.print_exc(file=exc)
!   warnings.warn("Couldn't load model from pymodel_StoreEmployee.py\nReason:\n%s"%exc.getvalue())
!   del exc
! 
! 
! try:
!   if ModelSet.defaultModelSet().modelNamed("StoreEmployees") is None:
!     from model_StoreEmployees import model_src
!     ModelSet.defaultModelSet().addModelFromXML({'string': model_src})
!     del model_src
!     model=ModelSet.defaultModelSet().modelNamed('StoreEmployees')
! except:
!   exc=StringIO.StringIO()
!   traceback.print_exc(file=exc)
!   warnings.warn("Couldn't load model 'model_StoreEmployees.xml'\nReason:\n%s"%exc.getvalue())
!   del exc
  
! del os, warnings, StringIO, traceback
  
! # Or, alternatively: use the xml file (ok for dev. mode, not for install w/
! # distutils)
! #
! # from Modeling import ModelSet
! # import os, warnings, StringIO, traceback
! # try:
! #   if ModelSet.defaultModelSet().modelNamed("StoreEmployees") is None:
! #     from os import getcwd, path
! #     mydir = os.path.abspath(os.path.dirname(__file__))
! #     xmlmodelPath=path.join(mydir,'model_StoreEmployees.xml')
! #     ModelSet.defaultModelSet().addModelFromXML({'file': xmlmodelPath})
! #     model=ModelSet.defaultModelSet().modelNamed('StoreEmployees')
! # except:
! #   exc=StringIO.StringIO()
! #   traceback.print_exc(file=exc)
! #   warnings.warn("Couldn't load model 'model_StoreEmployees.xml'\nReason:\n%s"%exc.getvalue())
! #   del exc
! # 
! # del os, warnings, StringIO, traceback
--- 1,14 ----
  # Load the model
  
! from Modeling import ModelSet, Model
  
! if ModelSet.defaultModelSet().modelNamed("StoreEmployees") is None:
!   import os
!   mydir = os.path.abspath(os.path.dirname(__file__))
!   model=Model.searchModel('StoreEmployees', mydir, verbose=0)
  
!   if not model:
!     import warnings
!     warnings.warn("Couldn't load model 'StoreEmployees'")
!   else:
!     ModelSet.defaultModelSet().addModel(model)