Merge pull request #1467 from WilliamBruneau/pyparsing_bump

Unlock pyparsing version
cea-sec · Jan 12, 2024 · ec29f74 · ec29f74
2 parents 3a2fb24 + 64df992
commit ec29f74
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/miasm/core/cpu.py b/miasm/core/cpu.py
@@ -393,7 +393,7 @@ def cb_op_mul(tokens):
 variable.setParseAction(cb_parse_id)
 operand = str_int | variable
 
-base_expr = pyparsing.operatorPrecedence(operand,
+base_expr = pyparsing.infixNotation(operand,
                                [(notop,   1, pyparsing.opAssoc.RIGHT, cb_op_not),
                                 (andop, 2, pyparsing.opAssoc.RIGHT, cb_op_and),
                                 (xorop, 2, pyparsing.opAssoc.RIGHT, cb_op_xor),

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-pyparsing~=2.0
+pyparsing>=2.4.1
 future
diff --git a/setup.py b/setup.py
@@ -325,7 +325,7 @@ def build_all():
                         "VERSION"
                     ]
                 },
-                install_requires=["future", "pyparsing~=2.0"],
+                install_requires=["future", "pyparsing>=2.4.1"],
                 cmdclass={"install_data": smart_install_data},
                 ext_modules = ext_modules,
                 # Metadata