about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCamille Mougey <camille.mougey@cea.fr>2015-02-16 12:48:11 +0100
committerCamille Mougey <camille.mougey@cea.fr>2015-02-16 12:48:11 +0100
commitc4a5c9ecb06e02426245aed37c8cee8eadc022a6 (patch)
tree6927533ec4d9191871ea8681445a6eabae319fe9
parent8d581fe43c36ee242fd863186c7b886e1ff75cef (diff)
downloadmiasm-c4a5c9ecb06e02426245aed37c8cee8eadc022a6.tar.gz
miasm-c4a5c9ecb06e02426245aed37c8cee8eadc022a6.zip
PyLint: Remove relative imports
miasm2/jitter/jitload.py:17: [W0403(relative-import), ] Relative import 'jitcore_tcc', should be 'miasm2.jitter.jitcore_tcc'
miasm2/jitter/jitload.py:22: [W0403(relative-import), ] Relative import 'jitcore_llvm', should be 'miasm2.jitter.jitcore_llvm'
miasm2/jitter/jitload.py:27: [W0403(relative-import), ] Relative import 'jitcore_python', should be 'miasm2.jitter.jitcore_python'
miasm2/jitter/jitcore.py:20: [W0403(relative-import), ] Relative import 'csts', should be 'miasm2.jitter.csts'
miasm2/jitter/jitcore_tcc.py:7: [W0403(relative-import), ] Relative import 'jitcore', should be 'miasm2.jitter.jitcore'
miasm2/jitter/jitcore_llvm.py:4: [W0403(relative-import), ] Relative import 'llvmconvert', should be 'miasm2.jitter.llvmconvert'
miasm2/jitter/jitcore_llvm.py:5: [W0403(relative-import), ] Relative import 'jitcore', should be 'miasm2.jitter.jitcore'
miasm2/jitter/loader/elf.py:7: [W0403(relative-import), ] Relative import 'utils', should be 'miasm2.jitter.loader.utils'
miasm2/core/cpu.py:11: [W0403(relative-import), ] Relative import 'bin_stream', should be 'miasm2.core.bin_stream'
miasm2/core/cpu.py:12: [W0403(relative-import), ] Relative import 'utils', should be 'miasm2.core.utils'
miasm2/arch/sh4/arch.py:9: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.sh4.regs'
miasm2/arch/msp430/sem.py:8: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.msp430.regs'
miasm2/arch/msp430/arch.py:10: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.msp430.regs'
miasm2/arch/msp430/arch.py:11: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.msp430.regs'
miasm2/arch/msp430/disasm.py:2: [W0403(relative-import), ] Relative import 'arch', should be 'miasm2.arch.msp430.arch'
miasm2/arch/arm/arch.py:10: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.arm.regs'
miasm2/arch/arm/arch.py:11: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.arm.regs'
miasm2/arch/arm/disasm.py:2: [W0403(relative-import), ] Relative import 'arch', should be 'miasm2.arch.arm.arch'
miasm2/arch/x86/sem.py:26: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.x86.regs'
miasm2/arch/x86/arch.py:9: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.x86.regs'
miasm2/arch/x86/arch.py:10: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.x86.regs'
miasm2/arch/x86/disasm.py:3: [W0403(relative-import), ] Relative import 'arch', should be 'miasm2.arch.x86.arch'
miasm2/arch/mips32/arch.py:10: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.mips32.regs'
miasm2/arch/mips32/arch.py:11: [W0403(relative-import), ] Relative import 'regs', should be 'miasm2.arch.mips32.regs'
miasm2/arch/mips32/disasm.py:2: [W0403(relative-import), ] Relative import 'arch', should be 'miasm2.arch.mips32.arch'
-rw-r--r--miasm2/arch/arm/arch.py4
-rw-r--r--miasm2/arch/arm/disasm.py2
-rw-r--r--miasm2/arch/mips32/arch.py4
-rw-r--r--miasm2/arch/mips32/disasm.py3
-rw-r--r--miasm2/arch/msp430/arch.py4
-rw-r--r--miasm2/arch/msp430/disasm.py2
-rw-r--r--miasm2/arch/msp430/sem.py1
-rw-r--r--miasm2/arch/sh4/arch.py2
-rw-r--r--miasm2/arch/x86/arch.py4
-rw-r--r--miasm2/arch/x86/disasm.py2
-rw-r--r--miasm2/arch/x86/sem.py1
-rw-r--r--miasm2/core/cpu.py4
-rw-r--r--miasm2/jitter/jitcore.py2
-rw-r--r--miasm2/jitter/jitcore_llvm.py4
-rw-r--r--miasm2/jitter/jitcore_tcc.py2
-rw-r--r--miasm2/jitter/jitload.py14
-rw-r--r--miasm2/jitter/loader/elf.py2
17 files changed, 27 insertions, 30 deletions
diff --git a/miasm2/arch/arm/arch.py b/miasm2/arch/arm/arch.py
index d93c85f4..51a6b20c 100644
--- a/miasm2/arch/arm/arch.py
+++ b/miasm2/arch/arm/arch.py
@@ -7,8 +7,8 @@ from miasm2.expression.expression import *
 from miasm2.core.cpu import *
 from collections import defaultdict
 from miasm2.core.bin_stream import bin_stream
-import regs as regs_module
-from regs import *
+import miasm2.arch.arm.regs as regs_module
+from miasm2.arch.arm.regs import *
 
 # A1 encoding
 
diff --git a/miasm2/arch/arm/disasm.py b/miasm2/arch/arm/disasm.py
index 3ba08995..03a17562 100644
--- a/miasm2/arch/arm/disasm.py
+++ b/miasm2/arch/arm/disasm.py
@@ -1,5 +1,5 @@
 from miasm2.core.asmbloc import asm_constraint, disasmEngine
-from arch import mn_arm, mn_armt
+from miasm2.arch.arm.arch import mn_arm, mn_armt
 
 
 def cb_arm_fix_call(
diff --git a/miasm2/arch/mips32/arch.py b/miasm2/arch/mips32/arch.py
index 48c33a35..eb163daa 100644
--- a/miasm2/arch/mips32/arch.py
+++ b/miasm2/arch/mips32/arch.py
@@ -7,8 +7,8 @@ from miasm2.expression.expression import *
 from miasm2.core.cpu import *
 from collections import defaultdict
 from miasm2.core.bin_stream import bin_stream
-import regs as regs_module
-from regs import *
+import miasm2.arch.mips32.regs as regs_module
+from miasm2.arch.mips32.regs import *
 
 
 log = logging.getLogger("mips32dis")
diff --git a/miasm2/arch/mips32/disasm.py b/miasm2/arch/mips32/disasm.py
index 53de308a..e5a70349 100644
--- a/miasm2/arch/mips32/disasm.py
+++ b/miasm2/arch/mips32/disasm.py
@@ -1,5 +1,5 @@
 from miasm2.core.asmbloc import disasmEngine
-from arch import mn_mips32
+from miasm2.arch.mips32.arch import mn_mips32
 
 
 
@@ -14,4 +14,3 @@ class dis_mips32l(disasmEngine):
     def __init__(self, bs=None, **kwargs):
         super(dis_mips32l, self).__init__(mn_mips32, self.attrib, bs, **kwargs)
 
-
diff --git a/miasm2/arch/msp430/arch.py b/miasm2/arch/msp430/arch.py
index dff91e7b..038c327f 100644
--- a/miasm2/arch/msp430/arch.py
+++ b/miasm2/arch/msp430/arch.py
@@ -7,8 +7,8 @@ from miasm2.expression.expression import *
 from miasm2.core.cpu import *
 from collections import defaultdict
 from miasm2.core.bin_stream import bin_stream
-import regs as regs_module
-from regs import *
+import miasm2.arch.msp430.regs as regs_module
+from miasm2.arch.msp430.regs import *
 
 log = logging.getLogger("armdis")
 console_handler = logging.StreamHandler()
diff --git a/miasm2/arch/msp430/disasm.py b/miasm2/arch/msp430/disasm.py
index f0138bdf..ac5d9cce 100644
--- a/miasm2/arch/msp430/disasm.py
+++ b/miasm2/arch/msp430/disasm.py
@@ -1,5 +1,5 @@
 from miasm2.core.asmbloc import disasmEngine
-from arch import mn_msp430
+from miasm2.arch.msp430.arch import mn_msp430
 
 
 class dis_msp430(disasmEngine):
diff --git a/miasm2/arch/msp430/sem.py b/miasm2/arch/msp430/sem.py
index 3a9ead35..ac4c7e9c 100644
--- a/miasm2/arch/msp430/sem.py
+++ b/miasm2/arch/msp430/sem.py
@@ -5,7 +5,6 @@ from miasm2.expression.expression import *
 from miasm2.arch.msp430.regs import *
 from miasm2.arch.msp430.arch import mn_msp430
 from miasm2.ir.ir import ir
-from regs import *
 
 
 # Utils
diff --git a/miasm2/arch/sh4/arch.py b/miasm2/arch/sh4/arch.py
index edd1a9ce..606136fd 100644
--- a/miasm2/arch/sh4/arch.py
+++ b/miasm2/arch/sh4/arch.py
@@ -6,7 +6,7 @@ from pyparsing import *
 from miasm2.core.cpu import *
 from miasm2.expression.expression import *
 from collections import defaultdict
-from regs import *
+from miasm2.arch.sh4.regs import *
 
 
 jra = ExprId('jra')
diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py
index e75c22a9..e9103ace 100644
--- a/miasm2/arch/x86/arch.py
+++ b/miasm2/arch/x86/arch.py
@@ -6,8 +6,8 @@ from miasm2.expression.expression import *
 from pyparsing import *
 from miasm2.core.cpu import *
 from collections import defaultdict
-import regs as regs_module
-from regs import *
+import miasm2.arch.x86.regs as regs_module
+from miasm2.arch.x86.regs import *
 from miasm2.ir.ir import *
 
 log = logging.getLogger("x86_arch")
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):
diff --git a/miasm2/arch/x86/sem.py b/miasm2/arch/x86/sem.py
index 137a7e18..69b5274c 100644
--- a/miasm2/arch/x86/sem.py
+++ b/miasm2/arch/x86/sem.py
@@ -23,7 +23,6 @@ from miasm2.arch.x86.arch import mn_x86, repeat_mn, replace_regs
 from miasm2.ir.ir import ir, irbloc
 import math
 import struct
-from regs import *
 
 # interrupt with eip update after instr
 EXCEPT_SOFT_BP = (1 << 1)
diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py
index 3fbe1e22..f4c627f4 100644
--- a/miasm2/core/cpu.py
+++ b/miasm2/core/cpu.py
@@ -8,8 +8,8 @@ from pyparsing import *
 from miasm2.expression.expression import *
 from miasm2.core import asmbloc
 from collections import defaultdict
-from bin_stream import bin_stream, bin_stream_str
-from utils import Disasm_Exception
+from miasm2.core.bin_stream import bin_stream, bin_stream_str
+from miasm2.core.utils import Disasm_Exception
 from miasm2.expression.simplifications import expr_simp
 
 log = logging.getLogger("cpuhelper")
diff --git a/miasm2/jitter/jitcore.py b/miasm2/jitter/jitcore.py
index c025c956..f1e34870 100644
--- a/miasm2/jitter/jitcore.py
+++ b/miasm2/jitter/jitcore.py
@@ -17,7 +17,7 @@
 #
 from miasm2.core import asmbloc
 from miasm2.core.interval import interval
-from csts import *
+from miasm2.jitter.csts import *
 
 
 class JitCore(object):
diff --git a/miasm2/jitter/jitcore_llvm.py b/miasm2/jitter/jitcore_llvm.py
index 2b828c80..acf91d15 100644
--- a/miasm2/jitter/jitcore_llvm.py
+++ b/miasm2/jitter/jitcore_llvm.py
@@ -1,8 +1,8 @@
 import os
 import importlib
 import hashlib
-from llvmconvert import *
-import jitcore
+from miasm2.jitter.llvmconvert import *
+import miasm2.jitter.jitcore as jitcore
 import Jitllvm
 
 
diff --git a/miasm2/jitter/jitcore_tcc.py b/miasm2/jitter/jitcore_tcc.py
index dd49f635..46b46184 100644
--- a/miasm2/jitter/jitcore_tcc.py
+++ b/miasm2/jitter/jitcore_tcc.py
@@ -4,7 +4,7 @@
 import os
 from miasm2.ir.ir2C import irblocs2C
 from subprocess import Popen, PIPE
-import jitcore
+import miasm2.jitter.jitcore as jitcore
 from distutils.sysconfig import get_python_inc
 import Jittcc
 
diff --git a/miasm2/jitter/jitload.py b/miasm2/jitter/jitload.py
index 4a8e9d1d..525cda09 100644
--- a/miasm2/jitter/jitload.py
+++ b/miasm2/jitter/jitload.py
@@ -14,17 +14,17 @@ log.addHandler(hnd)
 log.setLevel(logging.CRITICAL)
 
 try:
-    from jitcore_tcc import JitCore_Tcc
+    from miasm2.jitter.jitcore_tcc import JitCore_Tcc
 except ImportError:
     log.error('cannot import jit tcc')
 
 try:
-    from jitcore_llvm import JitCore_LLVM
+    from miasm2.jitter.jitcore_llvm import JitCore_LLVM
 except ImportError:
     log.error('cannot import jit llvm')
 
 try:
-    from jitcore_python import JitCore_Python
+    from miasm2.jitter.jitcore_python import JitCore_Python
 except ImportError:
     log.error('cannot import jit python')
 
@@ -140,13 +140,13 @@ class jitter:
         self.attrib = ir_arch.attrib
         arch_name = ir_arch.arch.name  # (ir_arch.arch.name, ir_arch.attrib)
         if arch_name == "x86":
-            from arch import JitCore_x86 as jcore
+            from miasm2.jitter.arch import JitCore_x86 as jcore
         elif arch_name == "arm":
-            from arch import JitCore_arm as jcore
+            from miasm2.jitter.arch import JitCore_arm as jcore
         elif arch_name == "msp430":
-            from arch import JitCore_msp430 as jcore
+            from miasm2.jitter.arch import JitCore_msp430 as jcore
         elif arch_name == "mips32":
-            from arch import JitCore_mips32 as jcore
+            from miasm2.jitter.arch import JitCore_mips32 as jcore
         else:
             raise ValueError("unsupported jit arch!")
 
diff --git a/miasm2/jitter/loader/elf.py b/miasm2/jitter/loader/elf.py
index 343bc292..916b37c4 100644
--- a/miasm2/jitter/loader/elf.py
+++ b/miasm2/jitter/loader/elf.py
@@ -4,7 +4,7 @@ from collections import defaultdict
 from elfesteem import cstruct
 from elfesteem import *
 from miasm2.jitter.csts import *
-from utils import canon_libname_libfunc, libimp
+from miasm2.jitter.loader.utils import canon_libname_libfunc, libimp
 from miasm2.core.interval import interval
 
 import logging