about summary refs log tree commit diff stats
path: root/miasm2/arch/x86/disasm.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2015-02-17 12:23:42 +0100
committerserpilliere <serpilliere@users.noreply.github.com>2015-02-17 12:23:42 +0100
commitc47688a9e8e049165a76b9bb3281c0381fa2d12f (patch)
treec1f68a979bfac603a3beccea678d4b8cfe3391dc /miasm2/arch/x86/disasm.py
parent13a3fcbb168589703d56d6c36312d788f68786e3 (diff)
parent0fcd954e10351f914b37a96d498aec39feb30b24 (diff)
downloadmiasm-c47688a9e8e049165a76b9bb3281c0381fa2d12f.tar.gz
miasm-c47688a9e8e049165a76b9bb3281c0381fa2d12f.zip
Merge pull request #71 from commial/pylinting
Pylinting
Diffstat (limited to 'miasm2/arch/x86/disasm.py')
-rw-r--r--miasm2/arch/x86/disasm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/miasm2/arch/x86/disasm.py b/miasm2/arch/x86/disasm.py
index e0841041..8d06fb8d 100644
--- a/miasm2/arch/x86/disasm.py
+++ b/miasm2/arch/x86/disasm.py
@@ -1,6 +1,6 @@
 from miasm2.core.asmbloc import asm_constraint, asm_label, disasmEngine
 from miasm2.expression.expression import ExprId
-from arch import mn_x86
+from miasm2.arch.x86.arch import mn_x86
 
 
 def cb_x86_callpop(mn, attrib, pool_bin, cur_bloc, offsets_to_dis, symbol_pool):