about summary refs log tree commit diff stats
path: root/miasm2/core/utils.py
diff options
context:
space:
mode:
authorPierre Lalet <pierre@droids-corp.org>2015-02-18 20:55:26 +0100
committerPierre Lalet <pierre@droids-corp.org>2015-02-18 20:55:26 +0100
commit736befb2b6fab02e601eae392a9969ac91f2caa3 (patch)
tree66b6208ca4ca21ac8efb3606930ffb664ecddc69 /miasm2/core/utils.py
parent5b3589b4735024e96becb5dbd8d25de4416f7cfb (diff)
parentdf19d375b8552406de77290c95ff41ef366b76c6 (diff)
downloadmiasm-736befb2b6fab02e601eae392a9969ac91f2caa3.tar.gz
miasm-736befb2b6fab02e601eae392a9969ac91f2caa3.zip
Merge pull request #76 from commial/pylinting
Pylinting (thanks for this work!)
Diffstat (limited to 'miasm2/core/utils.py')
-rw-r--r--miasm2/core/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/core/utils.py b/miasm2/core/utils.py
index 360deb8d..b2ddff2b 100644
--- a/miasm2/core/utils.py
+++ b/miasm2/core/utils.py
@@ -27,10 +27,10 @@ def hexdump(src, length=16):
     lines = []
     for c in xrange(0, len(src), length):
         chars = src[c:c + length]
-        hex = ' '.join(["%02x" % ord(x) for x in chars])
+        hexa = ' '.join(["%02x" % ord(x) for x in chars])
         printable = ''.join(
             ["%s" % ((ord(x) <= 127 and FILTER[ord(x)]) or '.') for x in chars])
-        lines.append("%04x  %-*s  %s\n" % (c, length * 3, hex, printable))
+        lines.append("%04x  %-*s  %s\n" % (c, length * 3, hexa, printable))
     print ''.join(lines)
 
 # stackoverflow.com/questions/2912231