[Modeling-cvs] ProjectModeling/Modeling QualifierParser.py,1.10,1.11

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

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

Modified Files:
	QualifierParser.py 
Log Message:
some cleaning

Index: QualifierParser.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/QualifierParser.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** QualifierParser.py	14 Jul 2003 12:14:16 -0000	1.10
--- QualifierParser.py	15 Jul 2003 09:30:59 -0000	1.11
***************
*** 72,79 ****
  
  from Qualifier import *
! import string, sys
  
! def trace(string, *args):
!   #print string%args
    pass
  
--- 72,79 ----
  
  from Qualifier import *
! import string
  
! def trace(msg, *args):
!   #print msg%args
    pass
  
***************
*** 542,546 ****
  def qualifierWithQualifierFormat(anExpression):
    "Used by Qualifier.qualifierFromQualifierFormat"
!   from StringIO import StringIO
    strIO=StringIO(anExpression)
    sc=scan(strIO)
--- 542,546 ----
  def qualifierWithQualifierFormat(anExpression):
    "Used by Qualifier.qualifierFromQualifierFormat"
!   from cStringIO import StringIO
    strIO=StringIO(anExpression)
    sc=scan(strIO)
***************
*** 556,560 ****
    try:
      if result.__class__ not in (KeyValueQualifier, KeyComparisonQualifier,
!                           AndQualifier, OrQualifier, NotQualifier):
        raise ValueError, 'Syntax error'
    except:
--- 556,560 ----
    try:
      if result.__class__ not in (KeyValueQualifier, KeyComparisonQualifier,
!                                 AndQualifier, OrQualifier, NotQualifier):
        raise ValueError, 'Syntax error'
    except: