diff --git a/filter2.py b/filter2.py index 3ba44a3..e696373 100644 --- a/filter2.py +++ b/filter2.py @@ -62,7 +62,8 @@ def pypexpr(): global expr if not expr: import pyparsing - txt = "".join(c for c in pyparsing.printables if c not in '()&|!=') + unicodePrintables = u''.join(unichr(c) for c in xrange(65536) if not unichr(c).isspace()) + txt = "".join(c for c in unicodePrintables if c not in '()&|!=') expr = pyparsing.nestedExpr("(", ")", pyparsing.Word(txt) | pyparsing.oneOf("& | != =")) return expr diff --git a/filter3.py b/filter3.py index 7b75218..27b3c8f 100644 --- a/filter3.py +++ b/filter3.py @@ -2,8 +2,9 @@ """Plus joli""" import pyparsing +unicodePrintables = u''.join(unichr(c) for c in xrange(65536) if not unichr(c).isspace()) -txt = pyparsing.Word("".join(c for c in pyparsing.printables if c not in '=()|&'),exact=1) +txt = pyparsing.Word("".join(c for c in unicodePrintables if c not in '=()|&'),exact=1) ne = pyparsing.Literal('!=') eq = pyparsing.Literal('=')