Update of /cvsroot/modeling/ProjectModeling/Modeling/tests/testPackages/StoreEmployees
In directory sc8-pr-cvs1:/tmp/cvs-serv3109/tests/testPackages/StoreEmployees
Modified Files:
Tag: brch-0_9pre7-1-PyModel
__init__.py
Log Message:
Added tests/testPackages/StoreEmployees/pymodel_StoreEmployees.py and
updated StoreEmployees/__init__.py: now loads the model from the
PyModel
Index: __init__.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/testPackages/StoreEmployees/__init__.py,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** __init__.py 21 Aug 2002 18:40:17 -0000 1.2
--- __init__.py 18 May 2003 15:26:25 -0000 1.2.4.1
***************
*** 3,10 ****
from Modeling import ModelSet
import os, warnings, StringIO, traceback
! from model_StoreEmployees import model_src
try:
if ModelSet.defaultModelSet().modelNamed("StoreEmployees") is None:
ModelSet.defaultModelSet().addModelFromXML({'string': model_src})
model=ModelSet.defaultModelSet().modelNamed('StoreEmployees')
except:
--- 3,25 ----
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:
***************
*** 14,18 ****
del exc
! del os, warnings, StringIO, traceback, model_src
# Or, alternatively: use the xml file (ok for dev. mode, not for install w/
--- 29,33 ----
del exc
! del os, warnings, StringIO, traceback
# Or, alternatively: use the xml file (ok for dev. mode, not for install w/
|
