Remove list comprehensions in favor of gen exprs

git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@308 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b

1 files changed, 3 insertions, 3 deletions

diff --git a/src/examples/chemicalFormulas.py b/src/examples/chemicalFormulas.py
index e7d7757..ce66afd 100644
--- a/src/examples/chemicalFormulas.py
+++ b/src/examples/chemicalFormulas.py
@@ -37,7 +37,7 @@ element = Word( alphas.upper(), alphas.lower(), max=2)
 elementRef = Group( element + Optional( Word( digits ), default="1" ) )

 formula = OneOrMore( elementRef )

 

-fn = lambda elemList : sum( [ atomicWeight[elem]*int(qty) for elem,qty in elemList ] )

+fn = lambda elemList : sum(atomicWeight[elem]*int(qty) for elem,qty in elemList)

 test( formula, "H2O", fn )

 test( formula, "C6H5OH", fn )

 test( formula, "NaCl", fn )

@@ -47,7 +47,7 @@ print()
 elementRef = Group( element("symbol") + Optional( Word( digits ), default="1" )("qty") )

 formula = OneOrMore( elementRef )

 

-fn = lambda elemList : sum( [ atomicWeight[elem.symbol]*int(elem.qty) for elem in elemList ] )

+fn = lambda elemList : sum(atomicWeight[elem.symbol]*int(elem.qty) for elem in elemList)

 test( formula, "H2O", fn )

 test( formula, "C6H5OH", fn )

 test( formula, "NaCl", fn )

@@ -58,7 +58,7 @@ integer = Word( digits ).setParseAction(lambda t:int(t[0]))
 elementRef = Group( element("symbol") + Optional( integer, default=1 )("qty") )

 formula = OneOrMore( elementRef )

 

-fn = lambda elemList : sum( [ atomicWeight[elem.symbol]*elem.qty for elem in elemList ] )

+fn = lambda elemList : sum(atomicWeight[elem.symbol]*elem.qty for elem in elemList)

 test( formula, "H2O", fn )

 test( formula, "C6H5OH", fn )

 test( formula, "NaCl", fn )