More Py2 compatibility scrubbing in unit tests, and migration ZeroOrMore to [...] notation
More Py2 compatibility scrubbing in unit tests, and migration ZeroOrMore to [...] notation

pyparsing/pyparsing,pyparsing/pyparsing