diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2024-01-12 14:47:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-12 14:47:35 +0100 |
| commit | ec29f74614b2906af63cf57ec2bc64652d342025 (patch) | |
| tree | 2504bbf4541b4850dffc56995e3aaba3bc153cdc | |
| parent | 3a2fb2472c0e8e01f84ed29be29a929775ed07ab (diff) | |
| parent | 64df992e382d32b51e6ea2d455510250db77e70b (diff) | |
| download | miasm-ec29f74614b2906af63cf57ec2bc64652d342025.tar.gz miasm-ec29f74614b2906af63cf57ec2bc64652d342025.zip | |
Merge pull request #1467 from WilliamBruneau/pyparsing_bump
Unlock pyparsing version
| -rw-r--r-- | miasm/core/cpu.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/miasm/core/cpu.py b/miasm/core/cpu.py index dae93bf9..7df9f991 100644 --- a/miasm/core/cpu.py +++ b/miasm/core/cpu.py @@ -393,7 +393,7 @@ variable = pyparsing.Word(pyparsing.alphas + "_$.", pyparsing.alphanums + "_") 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 index 5db3c2a8..b518400d 100644 --- 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 index a33f608f..e1e54434 100644 --- 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 |