diff options
| author | Florent Monjalet <florent.monjalet@gmail.com> | 2015-01-22 23:32:05 +0100 |
|---|---|---|
| committer | Florent Monjalet <florent.monjalet@gmail.com> | 2015-01-22 23:32:05 +0100 |
| commit | f8cdd0fb8bdd3c0a55d3af362758e06f7d5f6f74 (patch) | |
| tree | bf795f457d56d0b94c86f9b45a20906b2918ab14 | |
| parent | a6dc68e3564eea938381fc6510f12a679af7b07e (diff) | |
| download | miasm-f8cdd0fb8bdd3c0a55d3af362758e06f7d5f6f74.tar.gz miasm-f8cdd0fb8bdd3c0a55d3af362758e06f7d5f6f74.zip | |
Resolved conflict on miasm2/ir/translators/__init__.py
| -rw-r--r-- | miasm2/ir/translators/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/miasm2/ir/translators/__init__.py b/miasm2/ir/translators/__init__.py index 8087a7ee..22e00d98 100644 --- a/miasm2/ir/translators/__init__.py +++ b/miasm2/ir/translators/__init__.py @@ -3,5 +3,10 @@ from miasm2.ir.translators.translator import Translator import miasm2.ir.translators.C import miasm2.ir.translators.python import miasm2.ir.translators.miasm +try: + import miasm2.ir.translators.z3_ir +except ImportError: + # Nothing to do, z3 not available + pass __all__ = ["Translator"] |