diff options
Diffstat (limited to 'miasm/ir')
| -rw-r--r-- | miasm/ir/ir.py | 2 | ||||
| -rw-r--r-- | miasm/ir/translators/z3_ir.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/miasm/ir/ir.py b/miasm/ir/ir.py index e9b86899..d26c5d1d 100644 --- a/miasm/ir/ir.py +++ b/miasm/ir/ir.py @@ -48,7 +48,7 @@ def _expr_loc_to_symb(expr, loc_db): return m2_expr.ExprId(name, expr.size) -ESCAPE_CHARS = re.compile('[' + re.escape('{}') + '&|<>' + ']') +ESCAPE_CHARS = re.compile(r'[\{\}&|<>]') class TranslatorHtml(Translator): __LANG__ = "custom_expr_color" diff --git a/miasm/ir/translators/z3_ir.py b/miasm/ir/translators/z3_ir.py index 4b674c4e..c72ff36f 100644 --- a/miasm/ir/translators/z3_ir.py +++ b/miasm/ir/translators/z3_ir.py @@ -1,10 +1,11 @@ from builtins import map from builtins import range -import imp +import importlib.util import logging # Raise an ImportError if z3 is not available WITHOUT actually importing it -imp.find_module("z3") +if importlib.util.find_spec("z3") is None: + raise ImportError("No module named 'z3'") from miasm.ir.translators.translator import Translator |