about summary refs log tree commit diff stats
path: root/miasm2/analysis
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2015-02-18 15:44:37 +0100
committerCamille Mougey <commial@gmail.com>2015-02-18 15:44:37 +0100
commit5b3589b4735024e96becb5dbd8d25de4416f7cfb (patch)
tree9d0533c278d27a51c31dd1a82695ffee7508e475 /miasm2/analysis
parent60d709d36466e1eeb82de8428971870ead09ab5a (diff)
parentadc302eede328d03de44f327efea9ac5ce388862 (diff)
downloadmiasm-5b3589b4735024e96becb5dbd8d25de4416f7cfb.tar.gz
miasm-5b3589b4735024e96becb5dbd8d25de4416f7cfb.zip
Merge pull request #75 from p-l-/refactor-wildcards
Replace some wildcard imports
Diffstat (limited to '')
-rw-r--r--miasm2/analysis/binary.py2
-rw-r--r--miasm2/analysis/data_analysis.py3
-rw-r--r--miasm2/analysis/disasm_cb.py7
3 files changed, 7 insertions, 5 deletions
diff --git a/miasm2/analysis/binary.py b/miasm2/analysis/binary.py
index 17c87761..f5cecc87 100644
--- a/miasm2/analysis/binary.py
+++ b/miasm2/analysis/binary.py
@@ -1,6 +1,6 @@
 import logging
 
-from miasm2.core.bin_stream import *
+from miasm2.core.bin_stream import bin_stream_str, bin_stream_elf, bin_stream_pe
 from miasm2.jitter.csts import PAGE_READ
 
 
diff --git a/miasm2/analysis/data_analysis.py b/miasm2/analysis/data_analysis.py
index 06d28351..8462f150 100644
--- a/miasm2/analysis/data_analysis.py
+++ b/miasm2/analysis/data_analysis.py
@@ -1,4 +1,5 @@
-from miasm2.expression.expression import *
+from miasm2.expression.expression \
+    import get_expr_mem, get_list_rw, ExprId, ExprInt
 from miasm2.ir.symbexec import symbexec
 
 
diff --git a/miasm2/analysis/disasm_cb.py b/miasm2/analysis/disasm_cb.py
index d205d4eb..bf1db108 100644
--- a/miasm2/analysis/disasm_cb.py
+++ b/miasm2/analysis/disasm_cb.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
-from miasm2.expression.expression import *
+from miasm2.expression.expression import ExprInt, ExprId, ExprMem, MatchExpr
 from miasm2.expression.simplifications import expr_simp
-from miasm2.core.asmbloc import *
-from miasm2.core.utils import *
+from miasm2.core.asmbloc \
+    import asm_symbol_pool, asm_constraint_next, asm_constraint_to
+from miasm2.core.utils import upck32
 # from miasm2.core.graph import DiGraph