[Modeling-cvs] ProjectModeling/Modeling QualifierParser.py,1.13,1.14

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

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17281/Modeling

Modified Files:
	QualifierParser.py 
Log Message:
Fixed bug #918103: infinite loop when spark is not installed

Index: QualifierParser.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/QualifierParser.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** QualifierParser.py	14 Feb 2004 18:27:04 -0000	1.13
--- QualifierParser.py	22 Mar 2004 20:30:28 -0000	1.14
***************
*** 72,76 ****
  """
  
! from Qualifier import *
  import string
  
--- 72,83 ----
  """
  
! try:
!   import spark
! except ImportError:
!   import sys
!   try: del sys.modules['Modeling.QualifierParser']
!   except: pass
!   raise
! from Qualifier import KeyValueQualifier, KeyComparisonQualifier, AndQualifier, OrQualifier, NotQualifier, operatorForString, allQualifierOperators
  import string
  
***************
*** 123,127 ****
  #  ASTTraversal is a deprecated interface to GenericASTTraversal.
  #
- import spark
  ASTTraversal = spark.GenericASTTraversal
  
--- 130,133 ----